diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-16 15:54:10 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-16 15:54:10 +0000 |
| commit | 28832fef7c88f7050639791af8e51c4acb58cff6 (patch) | |
| tree | 55df05e68c0e10f53596f9dad9c8b1d9505fca60 | |
| parent | fa4545e3f9902268e19befe14854e5cd3c055c9a (diff) | |
| parent | ff16ee63e64a34dd0f23909f64664726d108d918 (diff) | |
| download | gitlab-ce-28832fef7c88f7050639791af8e51c4acb58cff6.tar.gz | |
Merge branch 'issuable-sidebar' into 'master'
Issuable sidebar tweaks
- Move cross-project reference down
- ~~Fix "Notifications" label color~~ Reverted
- ~~Use regularly colored button for "Subscribe"/"Unsubscribe"~~ Reverted
Before:
After:
(Only the moved cross-project reference is still relevant, other changes have been reverted)
cc @skyruler
cc @rspeicher 8.3 please!
See merge request !2105
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 0019f739b89..79c5cc7f40a 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -1,13 +1,5 @@ .issuable-sidebar.issuable-affix = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f| - .block - .title - Cross-project reference - .cross-project-reference - %span#cross-project-reference - = cross_project_reference(@project, issuable) - = clipboard_button(clipboard_target: 'span#cross-project-reference') - .block.assignee .title %label @@ -62,6 +54,14 @@ = f.collection_select :label_ids, issuable.project.labels.all, :id, :name, { selected: issuable.label_ids }, multiple: true, class: 'select2 js-select2', data: { placeholder: "Select labels" } + .block + .title + Cross-project reference + .cross-project-reference + %span#cross-project-reference + = cross_project_reference(@project, issuable) + = clipboard_button(clipboard_target: 'span#cross-project-reference') + = render "shared/issuable/participants", participants: issuable.participants(current_user) - if current_user |