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
Tatuya Kamada
gitlab-ce
Commits
970b2ed9
Commit
970b2ed9
authored
Apr 13, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated MR compare
Based on in feedback in !3228
parent
5d14615a
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
26 deletions
+31
-26
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+5
-0
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+1
-1
app/views/projects/merge_requests/_new_compare.html.haml
app/views/projects/merge_requests/_new_compare.html.haml
+12
-20
app/views/projects/merge_requests/dropdowns/_branch.html.haml
...views/projects/merge_requests/dropdowns/_branch.html.haml
+5
-0
app/views/projects/merge_requests/dropdowns/_project.html.haml
...iews/projects/merge_requests/dropdowns/_project.html.haml
+5
-0
app/views/projects/merge_requests/update_branches.html.haml
app/views/projects/merge_requests/update_branches.html.haml
+3
-5
No files found.
app/assets/stylesheets/pages/commits.scss
View file @
970b2ed9
...
...
@@ -75,6 +75,11 @@ li.commit {
}
}
.item-title
{
display
:
inline-block
;
max-width
:
70%
;
}
.commit-row-description
{
font-size
:
14px
;
border-left
:
1px
solid
#eee
;
...
...
app/views/projects/commits/_commit.html.haml
View file @
970b2ed9
...
...
@@ -11,7 +11,7 @@
=
cache
(
cache_key
)
do
%li
.commit.js-toggle-container
{
id:
"commit-#{commit.short_id}"
}
.commit-row-title
%span
.item-title
.str-truncated
%span
.item-title
=
link_to_gfm
commit
.
title
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
.
id
),
class:
"commit-row-message"
-
if
commit
.
description?
%a
.text-expander.js-toggle-button
...
...
...
app/views/projects/merge_requests/_new_compare.html.haml
View file @
970b2ed9
...
...
@@ -16,11 +16,9 @@
=
dropdown_title
(
"Select source project"
)
=
dropdown_filter
(
"Search projects"
)
=
dropdown_content
do
-
is_active
=
f
.
object
.
source_project_id
==
@merge_request
.
source_project
.
id
%ul
%li
%a
{
href:
"#"
,
class:
"#{("
is
-
active
" if is_active)}"
,
data:
{
id:
@merge_request
.
source_project
.
id
}
}
=
@merge_request
.
source_project_path
=
render
'projects/merge_requests/dropdowns/project'
,
projects:
[
@merge_request
.
source_project
],
selected:
f
.
object
.
source_project_id
.merge-request-select.dropdown
=
f
.
hidden_field
:source_branch
=
dropdown_toggle
"Select source branch"
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[source_branch]"
},
{
toggle_class:
"js-compare-dropdown js-source-branch"
}
...
...
@@ -28,11 +26,9 @@
=
dropdown_title
(
"Select source branch"
)
=
dropdown_filter
(
"Search branches"
)
=
dropdown_content
do
%ul
-
@merge_request
.
source_branches
.
each
do
|
branch
|
%li
%a
{
href:
"#"
,
class:
"#{("
is
-
active
" if f.object.source_branch == branch)}"
,
data:
{
id:
branch
}
}
=
branch
=
render
'projects/merge_requests/dropdowns/branch'
,
branches:
@merge_request
.
source_branches
,
selected:
f
.
object
.
source_branch
.panel-footer
=
icon
(
'spinner spin'
,
class:
'js-source-loading'
)
%ul
.list-unstyled.mr_source_commit
...
...
@@ -50,11 +46,9 @@
=
dropdown_title
(
"Select target project"
)
=
dropdown_filter
(
"Search projects"
)
=
dropdown_content
do
%ul
-
projects
.
each
do
|
project
|
%li
%a
{
href:
"#"
,
class:
"#{("
is
-
active
" if f.object.target_project_id == project.id)}"
,
data:
{
id:
project
.
id
}
}
=
project
.
path_with_namespace
=
render
'projects/merge_requests/dropdowns/project'
,
projects:
projects
,
selected:
f
.
object
.
target_project_id
.merge-request-select.dropdown
=
f
.
hidden_field
:target_branch
=
dropdown_toggle
f
.
object
.
target_branch
,
{
toggle:
"dropdown"
,
field_name:
"
#{
f
.
object_name
}
[target_branch]"
},
{
toggle_class:
"js-compare-dropdown js-target-branch"
}
...
...
@@ -62,11 +56,9 @@
=
dropdown_title
(
"Select target branch"
)
=
dropdown_filter
(
"Search branches"
)
=
dropdown_content
do
%ul
-
@merge_request
.
target_branches
.
each
do
|
branch
|
%li
%a
{
href:
"#"
,
class:
"#{("
is
-
active
" if f.object.target_branch == branch)}"
,
data:
{
id:
branch
}
}
=
branch
=
render
'projects/merge_requests/dropdowns/branch'
,
branches:
@merge_request
.
target_branches
,
selected:
f
.
object
.
target_branch
.panel-footer
=
icon
(
'spinner spin'
,
class:
"js-target-loading"
)
%ul
.list-unstyled.mr_target_commit
...
...
app/views/projects/merge_requests/dropdowns/_branch.html.haml
0 → 100644
View file @
970b2ed9
%ul
-
branches
.
each
do
|
branch
|
%li
%a
{
href:
'#'
,
class:
"#{('is-active' if selected == branch)}"
,
data:
{
id:
branch
}
}
=
branch
app/views/projects/merge_requests/dropdowns/_project.html.haml
0 → 100644
View file @
970b2ed9
%ul
-
projects
.
each
do
|
project
|
%li
%a
{
href:
"#"
,
class:
"#{('is-active' if selected == project.id)}"
,
data:
{
id:
project
.
id
}
}
=
project
.
path_with_namespace
app/views/projects/merge_requests/update_branches.html.haml
View file @
970b2ed9
%ul
-
@target_branches
.
each
do
|
branch
|
%li
%a
{
href:
"#"
,
class:
"#{("
is
-
active
" if "
a
" == branch)}"
,
data:
{
id:
branch
}
}
=
branch
=
render
'projects/merge_requests/dropdowns/branch'
,
branches:
@target_branches
,
selected:
nil
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