Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
d336e2d0
Commit
d336e2d0
authored
Nov 30, 2017
by
Vitaliy @blackst0ne Klachkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update empty state page of merge request 'changes' tab
parent
f7254a40
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
1 deletion
+20
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+6
-0
app/views/projects/merge_requests/diffs/_diffs.html.haml
app/views/projects/merge_requests/diffs/_diffs.html.haml
+9
-1
changelogs/unreleased/update_mr_changes_empty_page.yml
changelogs/unreleased/update_mr_changes_empty_page.yml
+5
-0
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
d336e2d0
...
@@ -384,6 +384,12 @@
...
@@ -384,6 +384,12 @@
}
}
}
}
.nothing-here-block
{
img
{
width
:
230px
;
}
}
.mr-list
{
.mr-list
{
.merge-request
{
.merge-request
{
padding
:
10px
0
10px
15px
;
padding
:
10px
0
10px
15px
;
...
...
app/views/projects/merge_requests/diffs/_diffs.html.haml
View file @
d336e2d0
...
@@ -2,4 +2,12 @@
...
@@ -2,4 +2,12 @@
=
render
'projects/merge_requests/diffs/versions'
=
render
'projects/merge_requests/diffs/versions'
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
environment:
@environment
,
merge_request:
true
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
environment:
@environment
,
merge_request:
true
-
elsif
@merge_request_diff
.
empty?
-
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'
changelogs/unreleased/update_mr_changes_empty_page.yml
0 → 100644
View file @
d336e2d0
---
title
:
Update empty state page of merge request 'changes' tab
merge_request
:
15611
author
:
Vitaliy @blackst0ne Klachkov
type
:
added
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