diff options
author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-17 16:00:46 +0000 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-17 16:00:46 +0000 |
commit | 82fbbe45011c8feaf24828575f66be81c3db7c85 (patch) | |
tree | ce60d7922f97a3ddac8f664d179e90a924a3aa81 | |
parent | f1818e578259e28b44a575ca0d6297d67e53777e (diff) | |
parent | 0fad3d1ea6cd3720122af50fde9f36443a925a44 (diff) | |
download | gitlab-ce-82fbbe45011c8feaf24828575f66be81c3db7c85.tar.gz |
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
-rw-r--r-- | app/assets/stylesheets/framework/snippets.scss | 3 | ||||
-rw-r--r-- | app/models/list.rb | 3 | ||||
-rw-r--r-- | app/views/shared/boards/components/_board.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/snippets/_header.html.haml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/46303_copy_button_fix_embedded_snippets.yml | 5 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/list.json | 2 |
6 files changed, 4 insertions, 13 deletions
diff --git a/app/assets/stylesheets/framework/snippets.scss b/app/assets/stylesheets/framework/snippets.scss index 430633bb01b..606d4675f19 100644 --- a/app/assets/stylesheets/framework/snippets.scss +++ b/app/assets/stylesheets/framework/snippets.scss @@ -67,8 +67,7 @@ padding: 8px 40px; } - .embed-toggle, - .snippet-clipboard-btn { + .embed-toggle { height: 35px; } } diff --git a/app/models/list.rb b/app/models/list.rb index 5daf35ef845..918275be142 100644 --- a/app/models/list.rb +++ b/app/models/list.rb @@ -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 diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml index aea40df41b0..4bff6468bb0 100644 --- a/app/views/shared/boards/components/_board.html.haml +++ b/app/views/shared/boards/components/_board.html.haml @@ -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.textColor ? list.label.textColor : \"#2e2e2e\") }" } + ":style" => "{ backgroundColor: (list.label && list.label.color ? list.label.color : null), color: (list.label && list.label.text_color ? list.label.text_color : \"#2e2e2e\") }" } {{ list.title }} - if can?(current_user, :admin_list, current_board_parent) diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml index 9f55c10d19b..836230ae8ee 100644 --- a/app/views/shared/snippets/_header.html.haml +++ b/app/views/shared/snippets/_header.html.haml @@ -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 diff --git a/changelogs/unreleased/46303_copy_button_fix_embedded_snippets.yml b/changelogs/unreleased/46303_copy_button_fix_embedded_snippets.yml deleted file mode 100644 index c8cdf3672b3..00000000000 --- a/changelogs/unreleased/46303_copy_button_fix_embedded_snippets.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: fixed copy to blipboard button in embed bar of snippets -merge_request: 18923 -author: haseebeqx -type: fixed diff --git a/spec/fixtures/api/schemas/list.json b/spec/fixtures/api/schemas/list.json index 05922df6b81..622a1e40d07 100644 --- a/spec/fixtures/api/schemas/list.json +++ b/spec/fixtures/api/schemas/list.json @@ -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"] } } }, |