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
4e3b9e03
Commit
4e3b9e03
authored
Dec 13, 2016
by
Mike Greiling
Committed by
Alfredo Sumaran
Dec 21, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove button class size alteration from revert and cherry pick links
parent
26a80149
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+2
-2
app/views/projects/merge_requests/widget/_merged_buttons.haml
...views/projects/merge_requests/widget/_merged_buttons.haml
+2
-2
No files found.
app/helpers/commits_helper.rb
View file @
4e3b9e03
...
@@ -131,7 +131,7 @@ module CommitsHelper
...
@@ -131,7 +131,7 @@ module CommitsHelper
return
unless
current_user
return
unless
current_user
tooltip
=
"Revert this
#{
commit
.
change_type_title
(
current_user
)
}
in a new merge request"
if
has_tooltip
tooltip
=
"Revert this
#{
commit
.
change_type_title
(
current_user
)
}
in a new merge request"
if
has_tooltip
btn_class
=
"btn btn-
warning btn-
#{
btn_class
}
"
unless
btn_class
.
nil?
btn_class
=
"btn btn-
#{
btn_class
}
"
unless
btn_class
.
nil?
if
can_collaborate_with_project?
if
can_collaborate_with_project?
link_to
'Revert'
,
'#modal-revert-commit'
,
'data-toggle'
=>
'modal'
,
'data-container'
=>
'body'
,
title:
(
tooltip
if
has_tooltip
),
class:
"
#{
btn_class
}
#{
'has-tooltip'
if
has_tooltip
}
"
link_to
'Revert'
,
'#modal-revert-commit'
,
'data-toggle'
=>
'modal'
,
'data-container'
=>
'body'
,
title:
(
tooltip
if
has_tooltip
),
class:
"
#{
btn_class
}
#{
'has-tooltip'
if
has_tooltip
}
"
...
@@ -145,7 +145,7 @@ module CommitsHelper
...
@@ -145,7 +145,7 @@ module CommitsHelper
return
unless
current_user
return
unless
current_user
tooltip
=
"Cherry-pick this
#{
commit
.
change_type_title
(
current_user
)
}
in a new merge request"
if
has_tooltip
tooltip
=
"Cherry-pick this
#{
commit
.
change_type_title
(
current_user
)
}
in a new merge request"
if
has_tooltip
btn_class
=
"btn btn-
default btn-
#{
btn_class
}
"
unless
btn_class
.
nil?
btn_class
=
"btn btn-
#{
btn_class
}
"
unless
btn_class
.
nil?
if
can_collaborate_with_project?
if
can_collaborate_with_project?
link_to
'Cherry-pick'
,
'#modal-cherry-pick-commit'
,
'data-toggle'
=>
'modal'
,
'data-container'
=>
'body'
,
title:
(
tooltip
if
has_tooltip
),
class:
"
#{
btn_class
}
#{
'has-tooltip'
if
has_tooltip
}
"
link_to
'Cherry-pick'
,
'#modal-cherry-pick-commit'
,
'data-toggle'
=>
'modal'
,
'data-container'
=>
'body'
,
title:
(
tooltip
if
has_tooltip
),
class:
"
#{
btn_class
}
#{
'has-tooltip'
if
has_tooltip
}
"
...
...
app/views/projects/merge_requests/widget/_merged_buttons.haml
View file @
4e3b9e03
...
@@ -9,6 +9,6 @@
...
@@ -9,6 +9,6 @@
=
icon
(
'trash-o'
)
=
icon
(
'trash-o'
)
Remove Source Branch
Remove Source Branch
-
if
mr_can_be_reverted
-
if
mr_can_be_reverted
=
revert_commit_link
(
@merge_request
.
merge_commit
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
btn_class:
'sm'
)
=
revert_commit_link
(
@merge_request
.
merge_commit
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
btn_class:
"warning"
)
-
if
mr_can_be_cherry_picked
-
if
mr_can_be_cherry_picked
=
cherry_pick_commit_link
(
@merge_request
.
merge_commit
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
btn_class:
'sm'
)
=
cherry_pick_commit_link
(
@merge_request
.
merge_commit
,
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
btn_class:
"default"
)
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