diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-30 20:35:51 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-30 20:35:51 +0000 |
| commit | 30c7fef03955bb4d2627b1de419be672c97a6df6 (patch) | |
| tree | 76a105b8458179bebd75b36eee31e10f1f5b47d7 | |
| parent | 8513072e963971ba7b09bd5d60a70f0d2e030f76 (diff) | |
| parent | 8fd0887fe4ab1c8ccee2fe023af2b6b2afd22ecc (diff) | |
| download | gitlab-ce-30c7fef03955bb4d2627b1de419be672c97a6df6.tar.gz | |
Merge branch 'fix-assigned-issuable-lists' into 'master'
Add issuable-list class to shared mr/issue lists to fix new responsive layout
See merge request !12591
| -rw-r--r-- | app/views/shared/_issues.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_merge_requests.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-assigned-issuable-lists.yml | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml index 3a49227961f..49555b6ff4e 100644 --- a/app/views/shared/_issues.html.haml +++ b/app/views/shared/_issues.html.haml @@ -1,6 +1,6 @@ - if @issues.to_a.any? .panel.panel-default.panel-small.panel-without-border - %ul.content-list.issues-list + %ul.content-list.issues-list.issuable-list = render partial: 'projects/issues/issue', collection: @issues = paginate @issues, theme: "gitlab" - else diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml index eecbb32e90e..0517896cfbd 100644 --- a/app/views/shared/_merge_requests.html.haml +++ b/app/views/shared/_merge_requests.html.haml @@ -1,6 +1,6 @@ - if @merge_requests.to_a.any? .panel.panel-default.panel-small.panel-without-border - %ul.content-list.mr-list + %ul.content-list.mr-list.issuable-list = render partial: 'projects/merge_requests/merge_request', collection: @merge_requests = paginate @merge_requests, theme: "gitlab" diff --git a/changelogs/unreleased/fix-assigned-issuable-lists.yml b/changelogs/unreleased/fix-assigned-issuable-lists.yml new file mode 100644 index 00000000000..fc2cd18ddb6 --- /dev/null +++ b/changelogs/unreleased/fix-assigned-issuable-lists.yml @@ -0,0 +1,5 @@ +--- +title: Add issuable-list class to shared mr/issue lists to fix new responsive layout + design +merge_request: +author: |