Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace.
This commit is contained in:
parent
33a8f53f7a
commit
737f322e41
5 changed files with 17 additions and 3 deletions
|
@ -48,6 +48,7 @@ v 7.10.0 (unreleased)
|
|||
- Prevent note form from being cleared when submitting failed.
|
||||
- Improve file icons rendering on tree (Sullivan Sénéchal)
|
||||
- API: Add pagination to project events
|
||||
- Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace.
|
||||
|
||||
v 7.9.0
|
||||
- Send EmailsOnPush email when branch or tag is created or deleted.
|
||||
|
|
|
@ -36,8 +36,11 @@ class Import::BitbucketController < Import::BaseController
|
|||
def create
|
||||
@repo_id = params[:repo_id] || ""
|
||||
repo = client.project(@repo_id.gsub("___", "/"))
|
||||
@target_namespace = params[:new_namespace].presence || repo["owner"]
|
||||
@project_name = repo["slug"]
|
||||
|
||||
repo_owner = repo["owner"]
|
||||
repo_owner = current_user.username if repo_owner == client.user["user"]["username"]
|
||||
@target_namespace = params[:new_namespace].presence || repo_owner
|
||||
|
||||
namespace = get_or_create_namespace || (render and return)
|
||||
|
||||
|
|
|
@ -31,8 +31,11 @@ class Import::GithubController < Import::BaseController
|
|||
def create
|
||||
@repo_id = params[:repo_id].to_i
|
||||
repo = client.repo(@repo_id)
|
||||
@target_namespace = params[:new_namespace].presence || repo.owner.login
|
||||
@project_name = repo.name
|
||||
|
||||
repo_owner = repo.owner.login
|
||||
repo_owner = current_user.username if repo_owner == client.user.login
|
||||
@target_namespace = params[:new_namespace].presence || repo_owner
|
||||
|
||||
namespace = get_or_create_namespace || (render and return)
|
||||
|
||||
|
|
|
@ -28,8 +28,11 @@ class Import::GitlabController < Import::BaseController
|
|||
def create
|
||||
@repo_id = params[:repo_id].to_i
|
||||
repo = client.project(@repo_id)
|
||||
@target_namespace = params[:new_namespace].presence || repo["namespace"]["path"]
|
||||
@project_name = repo["name"]
|
||||
|
||||
repo_owner = repo["namespace"]["path"]
|
||||
repo_owner = current_user.username if repo_owner == client.user["username"]
|
||||
@target_namespace = params[:new_namespace].presence || repo_owner
|
||||
|
||||
namespace = get_or_create_namespace || (render and return)
|
||||
|
||||
|
|
|
@ -28,6 +28,10 @@ module Gitlab
|
|||
client.auth_code.get_token(code, redirect_uri: redirect_uri).token
|
||||
end
|
||||
|
||||
def user
|
||||
api.get("/api/v3/user").parsed
|
||||
end
|
||||
|
||||
def issues(project_identifier)
|
||||
lazy_page_iterator(PER_PAGE) do |page|
|
||||
api.get("/api/v3/projects/#{project_identifier}/issues?per_page=#{PER_PAGE}&page=#{page}").parsed
|
||||
|
|
Loading…
Reference in a new issue