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
a7aee9d1
Commit
a7aee9d1
authored
Dec 19, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pretty compare mode
parent
40c6d871
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
18 deletions
+26
-18
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+8
-3
app/views/compare/_form.html.haml
app/views/compare/_form.html.haml
+18
-15
No files found.
app/assets/stylesheets/sections/commits.scss
View file @
a7aee9d1
...
...
@@ -303,9 +303,14 @@
.commits-compare-switch
{
background
:
url(
'switch_icon.png')
;
background
:
url(
"switch_icon.png")
no-repeat
center
center
;
width
:
16px
;
height
:
18px
;
text-indent
:
-9999px
;
display
:
inline-block
;
}
\ No newline at end of file
float
:
left
;
margin-right
:
9px
;
border
:
1px
solid
#DDD
;
@include
border-radius
(
4px
);
padding
:
4px
;
background-color
:
#EEE
;
}
app/views/compare/_form.html.haml
View file @
a7aee9d1
%div
%p
.slead
Fill input field with commit id like
%code
.label_branch
4eedf23
or branch/tag name like
%code
.label_branch
master
and press compare button for commits list, code diff.
-
unless
params
[
:to
]
%p
.slead
Fill input field with commit id like
%code
.label_branch
4eedf23
or branch/tag name like
%code
.label_branch
master
and press compare button for commits list, code diff.
%br
%br
=
form_tag
project_compare_index_path
(
@project
),
method: :post
do
.clearfix
=
text_field_tag
:from
,
params
[
:from
],
placeholder:
"master"
,
class:
"xlarge"
=
"..."
=
text_field_tag
:to
,
params
[
:to
],
placeholder:
"aa8b4ef"
,
class:
"xlarge"
-
if
params
[
:to
]
&&
params
[
:from
]
=
link_to
'switch'
,
{
from:
params
[
:to
],
to:
params
[
:from
]},
{
class:
'commits-compare-switch has_tooltip'
,
title:
'Switch base of comparison'
}
.pull-left
-
if
params
[
:to
]
&&
params
[
:from
]
=
link_to
'switch'
,
{
from:
params
[
:to
],
to:
params
[
:from
]},
{
class:
'commits-compare-switch has_tooltip'
,
title:
'Switch base of comparison'
}
=
text_field_tag
:from
,
params
[
:from
],
placeholder:
"master"
,
class:
"xlarge"
=
"..."
=
text_field_tag
:to
,
params
[
:to
],
placeholder:
"aa8b4ef"
,
class:
"xlarge"
.pull-left
=
submit_tag
"Compare"
,
class:
"btn primary wide commits-compare-btn"
-
if
@refs_are_same
.alert
%span
Refs are the same
.actions
=
submit_tag
"Compare"
,
class:
"btn primary wide commits-compare-btn"
:javascript
$
(
function
()
{
var
availableTags
=
#{
@project
.
ref_names
.
to_json
}
;
...
...
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