Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
dd178bbe
Commit
dd178bbe
authored
Dec 09, 2016
by
victorwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
In issue view, remove checking branches and new branch unavailable states
parent
ee5cc454
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
app/assets/javascripts/issue.js
app/assets/javascripts/issue.js
+0
-3
app/views/projects/issues/_new_branch.html.haml
app/views/projects/issues/_new_branch.html.haml
+0
-3
changelogs/unreleased/re-style-issue-new-branch.yml
changelogs/unreleased/re-style-issue-new-branch.yml
+3
-0
No files found.
app/assets/javascripts/issue.js
View file @
dd178bbe
...
@@ -139,15 +139,12 @@
...
@@ -139,15 +139,12 @@
return
;
return
;
}
}
return
$
.
getJSON
(
$container
.
data
(
'
path
'
)).
error
(
function
()
{
return
$
.
getJSON
(
$container
.
data
(
'
path
'
)).
error
(
function
()
{
$container
.
find
(
'
.checking
'
).
hide
();
$container
.
find
(
'
.unavailable
'
).
show
();
$container
.
find
(
'
.unavailable
'
).
show
();
return
new
Flash
(
'
Failed to check if a new branch can be created.
'
,
'
alert
'
);
return
new
Flash
(
'
Failed to check if a new branch can be created.
'
,
'
alert
'
);
}).
success
(
function
(
data
)
{
}).
success
(
function
(
data
)
{
if
(
data
.
can_create_branch
)
{
if
(
data
.
can_create_branch
)
{
$container
.
find
(
'
.checking
'
).
hide
();
$container
.
find
(
'
.available
'
).
show
();
$container
.
find
(
'
.available
'
).
show
();
}
else
{
}
else
{
$container
.
find
(
'
.checking
'
).
hide
();
return
$container
.
find
(
'
.unavailable
'
).
show
();
return
$container
.
find
(
'
.unavailable
'
).
show
();
}
}
});
});
...
...
app/views/projects/issues/_new_branch.html.haml
View file @
dd178bbe
-
if
can?
(
current_user
,
:push_code
,
@project
)
-
if
can?
(
current_user
,
:push_code
,
@project
)
.pull-right
.pull-right
#new-branch
.new-branch
{
'data-path'
=>
can_create_branch_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@issue
)}
#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
),
=
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
method: :post
,
class:
'btn btn-new btn-inverted btn-grouped has-tooltip available hide'
,
title:
@issue
.
to_branch_name
do
New branch
New branch
...
...
changelogs/unreleased/re-style-issue-new-branch.yml
0 → 100644
View file @
dd178bbe
---
title
:
Remove checking branches state in issue new branch button
merge_request
:
8023
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment