From dd178bbe6ab851da9dceb2acf2f0336166f08b48 Mon Sep 17 00:00:00 2001
From: victorwu <victor@gitlab.com>
Date: Fri, 9 Dec 2016 22:37:28 -0600
Subject: [PATCH] In issue view, remove checking branches and new branch
unavailable states
---
app/assets/javascripts/issue.js | 3 ---
app/views/projects/issues/_new_branch.html.haml | 3 ---
changelogs/unreleased/re-style-issue-new-branch.yml | 3 +++
3 files changed, 3 insertions(+), 6 deletions(-)
create mode 100644 changelogs/unreleased/re-style-issue-new-branch.yml
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
diff --git a/changelogs/unreleased/re-style-issue-new-branch.yml b/changelogs/unreleased/re-style-issue-new-branch.yml
new file mode 100644
index 00000000000..977a54ff2ae
--- /dev/null
+++ b/changelogs/unreleased/re-style-issue-new-branch.yml
@@ -0,0 +1,3 @@
+---
+title: Remove checking branches state in issue new branch button
+merge_request: 8023
--
GitLab