BigW Consortium Gitlab

Commit 1cb4c15f by Clement Ho

Merge branch '9-2-stable' into 9-2-stable-fix-conflicts-for-mr-11189

parents 385dac88 125e1151
...@@ -12,6 +12,15 @@ export default { ...@@ -12,6 +12,15 @@ export default {
commitsText() { commitsText() {
return gl.text.pluralize('commit', this.mr.divergedCommitsCount); 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: { methods: {
isBranchTitleLong(branchTitle) { isBranchTitleLong(branchTitle) {
......
...@@ -24,12 +24,16 @@ header { ...@@ -24,12 +24,16 @@ header {
&.navbar-gitlab { &.navbar-gitlab {
padding: 0 16px; padding: 0 16px;
z-index: 100; z-index: 400;
margin-bottom: 0; margin-bottom: 0;
min-height: $header-height; min-height: $header-height;
background-color: $gray-light; background-color: $gray-light;
border: none; border: none;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
position: fixed;
top: 0;
left: 0;
right: 0;
@media (max-width: $screen-xs-min) { @media (max-width: $screen-xs-min) {
padding: 0 16px; padding: 0 16px;
......
---
title: Paste a copied MR source branch name as code when pasted into a GFM form
merge_request:
author:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment