BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
1cb4c15f
Commit
1cb4c15f
authored
May 19, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189
parents
385dac88
125e1151
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
mr_widget_header.js
...s/vue_merge_request_widget/components/mr_widget_header.js
+9
-0
header.scss
app/assets/stylesheets/framework/header.scss
+5
-1
dm-copy-mr-source-branch-as-gfm.yml
changelogs/unreleased/dm-copy-mr-source-branch-as-gfm.yml
+4
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
View file @
1cb4c15f
...
...
@@ -12,6 +12,15 @@ export default {
commitsText
()
{
return
gl
.
text
.
pluralize
(
'commit'
,
this
.
mr
.
divergedCommitsCount
);
},
branchNameClipboardData
()
{
// This supports code in app/assets/javascripts/copy_to_clipboard.js that
// works around ClipboardJS limitations to allow the context-specific
// copy/pasting of plain text or GFM.
return
JSON
.
stringify
({
text
:
this
.
mr
.
sourceBranch
,
gfm
:
`\`
${
this
.
mr
.
sourceBranch
}
\``
,
});
},
},
methods
:
{
isBranchTitleLong
(
branchTitle
)
{
...
...
app/assets/stylesheets/framework/header.scss
View file @
1cb4c15f
...
...
@@ -24,12 +24,16 @@ header {
&
.navbar-gitlab
{
padding
:
0
16px
;
z-index
:
1
00
;
z-index
:
4
00
;
margin-bottom
:
0
;
min-height
:
$header-height
;
background-color
:
$gray-light
;
border
:
none
;
border-bottom
:
1px
solid
$border-color
;
position
:
fixed
;
top
:
0
;
left
:
0
;
right
:
0
;
@media
(
max-width
:
$screen-xs-min
)
{
padding
:
0
16px
;
...
...
changelogs/unreleased/dm-copy-mr-source-branch-as-gfm.yml
0 → 100644
View file @
1cb4c15f
---
title
:
Paste a copied MR source branch name as code when pasted into a GFM form
merge_request
:
author
:
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