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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
043c9f86
Commit
043c9f86
authored
Mar 26, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change Diff to Changes in views.
parent
78a7a9b0
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
app/views/notify/repository_push_email.html.haml
app/views/notify/repository_push_email.html.haml
+3
-3
app/views/notify/repository_push_email.text.haml
app/views/notify/repository_push_email.text.haml
+2
-2
app/views/projects/commits/_text_file.html.haml
app/views/projects/commits/_text_file.html.haml
+1
-1
app/views/projects/compare/show.html.haml
app/views/projects/compare/show.html.haml
+4
-4
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
app/views/projects/merge_requests/show/_diffs.html.haml
app/views/projects/merge_requests/show/_diffs.html.haml
+1
-1
No files found.
app/views/notify/repository_push_email.html.haml
View file @
043c9f86
...
...
@@ -7,7 +7,7 @@
%li
#{
commit
.
short_id
}
-
#{
commit
.
title
}
%h4
Diff
:
%h4
Changes
:
-
@diffs
.
each
do
|
diff
|
%li
%strong
...
...
@@ -23,6 +23,6 @@
%br
-
if
@compare
.
timeout
%h5
Huge diff. To prevent performance issues it was
hidden
%h5
To prevent performance issues changes are
hidden
-
elsif
@compare
.
commits_over_limit?
%h5
Diff for big amount of commits is disabled
%h5
Changes are not shown due to large amount of commits
app/views/notify/repository_push_email.text.haml
View file @
043c9f86
...
...
@@ -6,7 +6,7 @@ Commits:
#{
commit
.
short_id
}
-
#{
truncate
(
commit
.
title
,
length:
40
)
}
\
\
Diff
:
Changes
:
-
@diffs
.
each
do
|
diff
|
\
\=====================================
...
...
@@ -22,4 +22,4 @@ Diff:
-
if
@compare
.
timeout
Huge diff. To prevent performance issues it was hidden
-
elsif
@compare
.
commits_over_limit?
Diff for big amount of commits is disabled
Changes are not shown due to large amount of commits
app/views/projects/commits/_text_file.html.haml
View file @
043c9f86
-
too_big
=
diff
.
diff
.
lines
.
count
>
1000
-
if
too_big
%a
.supp_diff_link
Diff
suppressed. Click to show
%a
.supp_diff_link
Changes
suppressed. Click to show
%table
.text-file
{
class:
"#{'hide' if too_big}"
}
-
each_diff_line
(
diff
,
index
)
do
|
line
,
type
,
line_code
,
line_new
,
line_old
,
raw_line
|
...
...
app/views/projects/compare/show.html.haml
View file @
043c9f86
...
...
@@ -18,17 +18,17 @@
-
else
%ul
.well-list
=
render
Commit
.
decorate
(
@commits
),
project:
@project
%h4
Diff
%h4
Changes
-
if
@diffs
.
present?
=
render
"projects/commits/diffs"
,
diffs:
@diffs
,
project:
@project
-
elsif
@commits
.
size
>
MergeRequestDiff
::
COMMITS_SAFE_SIZE
.bs-callout.bs-callout-danger
%h4
This comparison includes more than
#{
MergeRequestDiff
::
COMMITS_SAFE_SIZE
}
commits.
%p
To preserve performance the line
diff is
not shown.
%p
To preserve performance the line
changes are
not shown.
-
elsif
@timeout
.bs-callout.bs-callout-danger
%h4
Diff
for this comparison is extremely large.
%p
Use command line to browse
diff
for this comparison.
%h4
Number of changed files
for this comparison is extremely large.
%p
Use command line to browse
through changes
for this comparison.
-
else
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
043c9f86
...
...
@@ -20,7 +20,7 @@
%li
.diffs-tab
{
data:
{
action:
'diffs'
}}
=
link_to
diffs_project_merge_request_path
(
@project
,
@merge_request
)
do
%i
.icon-list-alt
Diff
Changes
-
content_for
:note_actions
do
-
if
can?
(
current_user
,
:modify_merge_request
,
@merge_request
)
...
...
app/views/projects/merge_requests/show/_diffs.html.haml
View file @
043c9f86
...
...
@@ -5,7 +5,7 @@
-
else
.bs-callout.bs-callout-warning
%h4
Diff
for this comparison is extremely large.
Changes view
for this comparison is extremely large.
%p
You can
=
link_to
"download it"
,
project_merge_request_path
(
@merge_request
.
source_project
,
@merge_request
,
format: :diff
),
class:
"vlink"
...
...
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