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
86556a07
Commit
86556a07
authored
Sep 08, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve diff UI and mr compare page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
e9cf79da
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
17 deletions
+13
-17
app/assets/stylesheets/pages/commit.scss
app/assets/stylesheets/pages/commit.scss
+0
-8
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+8
-2
app/views/projects/diffs/_diffs.html.haml
app/views/projects/diffs/_diffs.html.haml
+2
-2
app/views/projects/diffs/_stats.html.haml
app/views/projects/diffs/_stats.html.haml
+1
-1
app/views/projects/merge_requests/_new_compare.html.haml
app/views/projects/merge_requests/_new_compare.html.haml
+1
-1
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+1
-3
No files found.
app/assets/stylesheets/pages/commit.scss
View file @
86556a07
...
@@ -26,14 +26,6 @@
...
@@ -26,14 +26,6 @@
margin-top
:
10px
;
margin-top
:
10px
;
}
}
.commit-stat-summary
{
color
:
#666
;
font-size
:
14px
;
font-weight
:
normal
;
padding
:
3px
0
;
margin-bottom
:
10px
;
}
.commit-info-row
{
.commit-info-row
{
margin-bottom
:
10px
;
margin-bottom
:
10px
;
.avatar
{
.avatar
{
...
...
app/assets/stylesheets/pages/diff.scss
View file @
86556a07
.diff-file
{
.diff-file
{
border
:
1px
solid
$border-color
;
margin-left
:
-16px
;
margin-bottom
:
1em
;
margin-right
:
-16px
;
border
:
none
;
border-bottom
:
1px
solid
#E7E9EE
;
.diff-header
{
.diff-header
{
position
:
relative
;
position
:
relative
;
...
@@ -367,3 +369,7 @@
...
@@ -367,3 +369,7 @@
white-space
:
pre-wrap
;
white-space
:
pre-wrap
;
}
}
.inline-parallel-buttons
{
float
:
right
;
margin-top
:
-5px
;
}
app/views/projects/diffs/_diffs.html.haml
View file @
86556a07
-
if
params
[
:view
]
==
'parallel'
-
if
params
[
:view
]
==
'parallel'
-
fluid_layout
true
-
fluid_layout
true
.
prepend-top-20.append-bottom-20
.
gray-content-block.second-block
.
pull-right
.
inline-parallel-buttons
.btn-group
.btn-group
=
inline_diff_btn
=
inline_diff_btn
=
parallel_diff_btn
=
parallel_diff_btn
...
...
app/views/projects/diffs/_stats.html.haml
View file @
86556a07
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
and
and
%strong
.cred
#{
@commit
.
stats
.
deletions
}
deletions
%strong
.cred
#{
@commit
.
stats
.
deletions
}
deletions
.file-stats.js-toggle-content.hide
.file-stats.js-toggle-content.hide
%ul
.bordered-list
%ul
-
diffs
.
each_with_index
do
|
diff
,
i
|
-
diffs
.
each_with_index
do
|
diff
,
i
|
%li
%li
-
if
diff
.
deleted_file
-
if
diff
.
deleted_file
...
...
app/views/projects/merge_requests/_new_compare.html.haml
View file @
86556a07
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
%h4
Compare failed
%h4
Compare failed
%p
We can't compare selected branches. It may be because of huge diff. Please try again or select different branches.
%p
We can't compare selected branches. It may be because of huge diff. Please try again or select different branches.
-
else
-
else
.light-well
.light-well
.append-bottom-10
.center
.center
%h4
%h4
There isn't anything to merge.
There isn't anything to merge.
...
...
app/views/projects/merge_requests/_new_submit.html.haml
View file @
86556a07
...
@@ -18,15 +18,13 @@
...
@@ -18,15 +18,13 @@
=
f
.
hidden_field
:target_branch
=
f
.
hidden_field
:target_branch
.mr-compare.merge-request
.mr-compare.merge-request
%ul
.
nav.nav-tabs.
merge-request-tabs
%ul
.merge-request-tabs
%li
.commits-tab
%li
.commits-tab
=
link_to
url_for
(
params
),
data:
{
target:
'#commits'
,
action:
'commits'
,
toggle:
'tab'
}
do
=
link_to
url_for
(
params
),
data:
{
target:
'#commits'
,
action:
'commits'
,
toggle:
'tab'
}
do
=
icon
(
'history'
)
Commits
Commits
%span
.badge
=
@commits
.
size
%span
.badge
=
@commits
.
size
%li
.diffs-tab.active
%li
.diffs-tab.active
=
link_to
url_for
(
params
),
data:
{
target:
'#diffs'
,
action:
'diffs'
,
toggle:
'tab'
}
do
=
link_to
url_for
(
params
),
data:
{
target:
'#diffs'
,
action:
'diffs'
,
toggle:
'tab'
}
do
=
icon
(
'list-alt'
)
Changes
Changes
%span
.badge
=
@diffs
.
size
%span
.badge
=
@diffs
.
size
...
...
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