diff options
| author | victorwu <victor@gitlab.com> | 2016-12-09 22:37:28 -0600 |
|---|---|---|
| committer | victorwu <victor@gitlab.com> | 2016-12-26 08:28:15 -0500 |
| commit | dd178bbe6ab851da9dceb2acf2f0336166f08b48 (patch) | |
| tree | 8db75f9e603981f5fd3da4feb48c023cc25db4cd /app | |
| parent | ee5cc454d78f0f244fb99f0ec3f5060fd1905c48 (diff) | |
| download | gitlab-ce-dd178bbe6ab851da9dceb2acf2f0336166f08b48.tar.gz | |
In issue view, remove checking branches and new branch unavailable states
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/issue.js | 3 | ||||
| -rw-r--r-- | app/views/projects/issues/_new_branch.html.haml | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js index 63b70d4be17..61e8531153b 100644 --- a/app/assets/javascripts/issue.js +++ b/app/assets/javascripts/issue.js @@ -139,15 +139,12 @@ return; } return $.getJSON($container.data('path')).error(function() { - $container.find('.checking').hide(); $container.find('.unavailable').show(); return new Flash('Failed to check if a new branch can be created.', 'alert'); }).success(function(data) { if (data.can_create_branch) { - $container.find('.checking').hide(); $container.find('.available').show(); } 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 c56b6cc11f5..4589e112279 100644 --- a/app/views/projects/issues/_new_branch.html.haml +++ b/app/views/projects/issues/_new_branch.html.haml @@ -1,9 +1,6 @@ - if can?(current_user, :push_code, @project) .pull-right #new-branch.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 btn-grouped has-tooltip available hide', title: @issue.to_branch_name do New branch |