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
82fbbe45
Commit
82fbbe45
authored
May 17, 2018
by
Mayra Cabrera
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '10-8-stable-revert' into '10-8-stable'
Reverts picking the MRs into the wrong branch See merge request gitlab-org/gitlab-ce!19013
parents
f1818e57
0fad3d1e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4 additions
and
13 deletions
+4
-13
snippets.scss
app/assets/stylesheets/framework/snippets.scss
+1
-2
list.rb
app/models/list.rb
+1
-2
_board.html.haml
app/views/shared/boards/components/_board.html.haml
+1
-1
_header.html.haml
app/views/shared/snippets/_header.html.haml
+1
-1
46303_copy_button_fix_embedded_snippets.yml
...gs/unreleased/46303_copy_button_fix_embedded_snippets.yml
+0
-5
list.json
spec/fixtures/api/schemas/list.json
+0
-2
No files found.
app/assets/stylesheets/framework/snippets.scss
View file @
82fbbe45
...
...
@@ -67,8 +67,7 @@
padding
:
8px
40px
;
}
.embed-toggle
,
.snippet-clipboard-btn
{
.embed-toggle
{
height
:
35px
;
}
}
app/models/list.rb
View file @
82fbbe45
...
...
@@ -31,8 +31,7 @@ class List < ActiveRecord::Base
if
options
.
key?
(
:label
)
json
[
:label
]
=
label
.
as_json
(
project:
board
.
project
,
only:
[
:id
,
:title
,
:description
,
:color
],
methods:
[
:text_color
]
only:
[
:id
,
:title
,
:description
,
:color
]
)
end
end
...
...
app/views/shared/boards/components/_board.html.haml
View file @
82fbbe45
...
...
@@ -15,7 +15,7 @@
":title"
=>
'(list.label ? list.label.description : "")'
,
data:
{
container:
"body"
,
placement:
"bottom"
},
class:
"label color-label title board-title-text"
,
":style"
=>
"{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.text
Color ? list.label.textC
olor :
\"
#2e2e2e
\"
) }"
}
":style"
=>
"{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.text
_color ? list.label.text_c
olor :
\"
#2e2e2e
\"
) }"
}
{{ list.title }}
-
if
can?
(
current_user
,
:admin_list
,
current_board_parent
)
...
...
app/views/shared/snippets/_header.html.haml
View file @
82fbbe45
...
...
@@ -45,6 +45,6 @@
%strong
.embed-toggle-list-item
=
_
(
"Share"
)
%input
.js-snippet-url-area.snippet-embed-input.form-control
{
type:
"text"
,
autocomplete:
'off'
,
value:
snippet_embed
}
.input-group-btn
%button
.js-clipboard-btn.
snippet-clipboard-btn.btn.btn-default.has-tooltip
{
title:
"Copy to clipboard"
,
'data-clipboard-target'
:
'.js-
snippet-url-area'
}
%button
.js-clipboard-btn.
btn.btn-default.has-tooltip
{
title:
"Copy to clipboard"
,
'data-clipboard-target'
:
'#
snippet-url-area'
}
=
sprite_icon
(
'duplicate'
,
size:
16
)
.clearfix
changelogs/unreleased/46303_copy_button_fix_embedded_snippets.yml
deleted
100644 → 0
View file @
f1818e57
---
title
:
fixed copy to blipboard button in embed bar of snippets
merge_request
:
18923
author
:
haseebeqx
type
:
fixed
spec/fixtures/api/schemas/list.json
View file @
82fbbe45
...
...
@@ -17,7 +17,6 @@
"required"
:
[
"id"
,
"color"
,
"text_color"
,
"description"
,
"title"
,
"priority"
...
...
@@ -30,7 +29,6 @@
},
"description"
:
{
"type"
:
[
"string"
,
"null"
]
},
"title"
:
{
"type"
:
"string"
},
"title"
:
{
"text_color"
:
"string"
},
"priority"
:
{
"type"
:
[
"integer"
,
"null"
]
}
}
},
...
...
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