diff options
| author | Eric K Idema <eki@vying.org> | 2016-05-02 18:22:38 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-30 19:48:17 +0300 |
| commit | 12aa1f898dbfea3aaeb2de351ac1cccef304717f (patch) | |
| tree | 86a15a55b4bd1666e7994d702a684589afa8efa4 /app/views/projects/new.html.haml | |
| parent | c5d164d1df46eb34668a032b234484f142e1a881 (diff) | |
Import from Github using Personal Access Tokens.
This stands as an alternative to using OAuth to access a user's Github
repositories. This is setup in such a way that it can be used without OAuth
configuration.
From a UI perspective, the how to import modal has been replaced by a full
page, which includes a form for posting a personal access token back to the
Import::GithubController.
If the user has logged in via GitHub, skip the Personal Access Token and go
directly to Github for an access token via OAuth.
Diffstat (limited to 'app/views/projects/new.html.haml')
| -rw-r--r-- | app/views/projects/new.html.haml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 8a73b077357..05f33b78a47 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -23,6 +23,7 @@ .input-group-addon = root_url = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user, display_path: true), {}, {class: 'select2 js-select-namespace', tabindex: 1} + - else .input-group-addon.static-namespace #{root_url}#{current_user.username}/ @@ -44,15 +45,8 @@ .col-sm-12.import-buttons %div - if github_import_enabled? - - if github_import_configured? - = link_to status_import_github_path, class: 'btn import_github' do - %i.fa.fa-github - GitHub - - else - = link_to '#', class: 'how_to_import_link btn import_github' do - %i.fa.fa-github - GitHub - = render 'github_import_modal' + = link_to new_import_github_path, class: 'btn import_github' do + = icon 'github', text: 'GitHub' %div - if bitbucket_import_enabled? - if bitbucket_import_configured? |