diff options
| author | Vitaliy @blackst0ne Klachkov <blackst0ne.ru@gmail.com> | 2017-11-30 15:59:35 +1100 |
|---|---|---|
| committer | Vitaliy @blackst0ne Klachkov <blackst0ne.ru@gmail.com> | 2017-11-30 15:59:35 +1100 |
| commit | d336e2d0ac8ac5a28ed174927aab64b52575a4a0 (patch) | |
| tree | 7c86cd4c4de79651162ae63eb45693823354353a | |
| parent | f7254a4060b30e3134c6cf932eaba0fc8e249e9a (diff) | |
| download | gitlab-ce-32329-empty-state-for-changes-tab-in-mr.tar.gz | |
Update empty state page of merge request 'changes' tab32329-empty-state-for-changes-tab-in-mr
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/diffs/_diffs.html.haml | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/update_mr_changes_empty_page.yml | 5 |
3 files changed, 20 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 5832cf4637f..2afb17334e3 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -384,6 +384,12 @@ } } +.nothing-here-block { + img { + width: 230px; + } +} + .mr-list { .merge-request { padding: 10px 0 10px 15px; diff --git a/app/views/projects/merge_requests/diffs/_diffs.html.haml b/app/views/projects/merge_requests/diffs/_diffs.html.haml index 0d30d6da68f..3d7a8f9d870 100644 --- a/app/views/projects/merge_requests/diffs/_diffs.html.haml +++ b/app/views/projects/merge_requests/diffs/_diffs.html.haml @@ -2,4 +2,12 @@ = render 'projects/merge_requests/diffs/versions' = render "projects/diffs/diffs", diffs: @diffs, environment: @environment, merge_request: true - elsif @merge_request_diff.empty? - .nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch} + .nothing-here-block + = image_tag 'illustrations/merge_request_changes_empty.svg' + %p + Nothing to merge from + %strong= @merge_request.source_branch + into + %strong= @merge_request.target_branch + + %p= link_to 'Create commit', project_new_blob_path(@project, @merge_request.source_branch), class: 'btn btn-save' diff --git a/changelogs/unreleased/update_mr_changes_empty_page.yml b/changelogs/unreleased/update_mr_changes_empty_page.yml new file mode 100644 index 00000000000..bae73c21e8f --- /dev/null +++ b/changelogs/unreleased/update_mr_changes_empty_page.yml @@ -0,0 +1,5 @@ +--- +title: Update empty state page of merge request 'changes' tab +merge_request: 15611 +author: Vitaliy @blackst0ne Klachkov +type: added |