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
Boxiang Sun
gitlab-ce
Commits
4f13a793
Commit
4f13a793
authored
Aug 18, 2016
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove green outline from `New branch unavailable` button on issue page (!5858)
parent
739620fe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
11 deletions
+10
-11
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/issue.js
app/assets/javascripts/issue.js
+1
-2
app/views/projects/issues/_new_branch.html.haml
app/views/projects/issues/_new_branch.html.haml
+8
-9
No files found.
CHANGELOG
View file @
4f13a793
...
@@ -20,6 +20,7 @@ v 8.11.0
...
@@ -20,6 +20,7 @@ v 8.11.0
- Add Issues Board !5548
- Add Issues Board !5548
- Allow resolving merge conflicts in the UI !5479
- Allow resolving merge conflicts in the UI !5479
- Improve diff performance by eliminating redundant checks for text blobs
- 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)
- Ensure that branch names containing escapable characters (e.g. %20) aren't unescaped indiscriminately. !5770 (ewiltshi)
- Convert switch icon into icon font (ClemMakesApps)
- Convert switch icon into icon font (ClemMakesApps)
- API: Endpoints for enabling and disabling deploy keys
- API: Endpoints for enabling and disabling deploy keys
...
...
app/assets/javascripts/issue.js
View file @
4f13a793
...
@@ -127,7 +127,7 @@
...
@@ -127,7 +127,7 @@
Issue
.
prototype
.
initCanCreateBranch
=
function
()
{
Issue
.
prototype
.
initCanCreateBranch
=
function
()
{
var
$container
;
var
$container
;
$container
=
$
(
'
div
#new-branch
'
);
$container
=
$
(
'
#new-branch
'
);
if
(
$container
.
length
===
0
)
{
if
(
$container
.
length
===
0
)
{
return
;
return
;
}
}
...
@@ -139,7 +139,6 @@
...
@@ -139,7 +139,6 @@
if
(
data
.
can_create_branch
)
{
if
(
data
.
can_create_branch
)
{
$container
.
find
(
'
.checking
'
).
hide
();
$container
.
find
(
'
.checking
'
).
hide
();
$container
.
find
(
'
.available
'
).
show
();
$container
.
find
(
'
.available
'
).
show
();
return
$container
.
find
(
'
a
'
).
attr
(
'
disabled
'
,
false
);
}
else
{
}
else
{
$container
.
find
(
'
.checking
'
).
hide
();
$container
.
find
(
'
.checking
'
).
hide
();
return
$container
.
find
(
'
.unavailable
'
).
show
();
return
$container
.
find
(
'
.unavailable
'
).
show
();
...
...
app/views/projects/issues/_new_branch.html.haml
View file @
4f13a793
-
if
can?
(
current_user
,
:push_code
,
@project
)
-
if
can?
(
current_user
,
:push_code
,
@project
)
.pull-right
.pull-right
#new-branch
{
'data-path'
=>
can_create_branch_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@issue
)}
#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 has-tooltip'
,
title:
@issue
.
to_branch_name
,
disabled:
'disabled'
do
method: :post
,
class:
'btn btn-new btn-inverted btn-grouped has-tooltip available hide'
,
title:
@issue
.
to_branch_name
do
.checking
New branch
=
icon
(
'spinner spin'
)
=
link_to
'#'
,
class:
'unavailable btn btn-grouped hide'
,
disabled:
'disabled'
do
Checking branches
=
icon
(
'exclamation-triangle'
)
.available.hide
New branch unavailable
New branch
.unavailable.hide
=
icon
(
'exclamation-triangle'
)
New branch unavailable
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