diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-09-02 12:52:37 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-02 12:52:37 +0000 |
| commit | a5d1428a91c16f07b73cf62401f9513db5fb85b7 (patch) | |
| tree | cf26d71bcbbb18315421092290fd096fde148780 | |
| parent | faac71215789cb8224c14be0a4fcbe252a99fa4f (diff) | |
| parent | 4f13a7935f24f258fde8288671ba2447639df446 (diff) | |
| download | gitlab-ce-a5d1428a91c16f07b73cf62401f9513db5fb85b7.tar.gz | |
Merge branch 'new-branch-unavailable-color' into 'master'
Remove green outline from `New branch unavailable` button on issue page
## What does this MR do?
- remove mistakenly added green outline from `New branch unavailable` button on issue page
- remove mistakenly added green outline from `Checking branches...` button on issue page
## Why was this MR needed?
`New branch unavailable` and `Checking branches...` buttons had green outline though that should only be added to the `New branch` button.
## What are the relevant issue numbers?
fixes #21006
## Screenshots
### Before
### After
See merge request !5858
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/issue.js | 3 | ||||
| -rw-r--r-- | app/views/projects/issues/_new_branch.html.haml | 17 |
3 files changed, 10 insertions, 11 deletions
diff --git a/CHANGELOG b/CHANGELOG index 934dabe743a..0eb076fd62f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -126,6 +126,7 @@ v 8.11.0 - Add Issues Board !5548 - Allow resolving merge conflicts in the UI !5479 - Improve diff performance by eliminating redundant checks for text blobs + - Remove green outline from `New branch unavailable` button on issue page !5858 (winniehell) - Ensure that branch names containing escapable characters (e.g. %20) aren't unescaped indiscriminately. !5770 (ewiltshi) - Convert switch icon into icon font (ClemMakesApps) - API: Endpoints for enabling and disabling deploy keys diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js index 6838d9d8da1..e6422602ce8 100644 --- a/app/assets/javascripts/issue.js +++ b/app/assets/javascripts/issue.js @@ -127,7 +127,7 @@ Issue.prototype.initCanCreateBranch = function() { var $container; - $container = $('div#new-branch'); + $container = $('#new-branch'); if ($container.length === 0) { return; } @@ -139,7 +139,6 @@ if (data.can_create_branch) { $container.find('.checking').hide(); $container.find('.available').show(); - return $container.find('a').attr('disabled', false); } else { $container.find('.checking').hide(); return $container.find('.unavailable').show(); diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml index 24749699c6d..33556a1a2b3 100644 --- a/app/views/projects/issues/_new_branch.html.haml +++ b/app/views/projects/issues/_new_branch.html.haml @@ -1,13 +1,12 @@ - if can?(current_user, :push_code, @project) .pull-right #new-branch{'data-path' => can_create_branch_namespace_project_issue_path(@project.namespace, @project, @issue)} + = link_to '#', class: 'checking btn btn-grouped', disabled: 'disabled' do + = icon('spinner spin') + Checking branches = link_to namespace_project_branches_path(@project.namespace, @project, branch_name: @issue.to_branch_name, issue_iid: @issue.iid), - method: :post, class: 'btn btn-new btn-inverted has-tooltip', title: @issue.to_branch_name, disabled: 'disabled' do - .checking - = icon('spinner spin') - Checking branches - .available.hide - New branch - .unavailable.hide - = icon('exclamation-triangle') - New branch unavailable + method: :post, class: 'btn btn-new btn-inverted btn-grouped has-tooltip available hide', title: @issue.to_branch_name do + New branch + = link_to '#', class: 'unavailable btn btn-grouped hide', disabled: 'disabled' do + = icon('exclamation-triangle') + New branch unavailable |