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
Léo-Paul Géneau
gitlab-ce
Commits
b8164321
Commit
b8164321
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
a80733e2
7842a815
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
2 deletions
+28
-2
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/calendar.js.coffee
app/assets/javascripts/calendar.js.coffee
+1
-1
app/helpers/diff_helper.rb
app/helpers/diff_helper.rb
+4
-0
app/views/users/calendar.html.haml
app/views/users/calendar.html.haml
+1
-1
features/project/merge_requests.feature
features/project/merge_requests.feature
+7
-0
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+14
-0
No files found.
CHANGELOG
View file @
b8164321
Please view this file on the master branch, on stable branches it's out of date.
v 7.10.0 (unreleased)
- Fix broken side-by-side diff view on merge request page (Stan Hu)
- Allow HTML tags in Markdown input
- Fix code unfold not working on Compare commits page (Stan Hu)
- Include missing events and fix save functionality in admin service template settings form (Stan Hu)
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/calendar.js.coffee
View file @
b8164321
class
@
c
alendar
class
@
C
alendar
options
=
month
:
"short"
day
:
"numeric"
...
...
This diff is collapsed.
Click to expand it.
app/helpers/diff_helper.rb
View file @
b8164321
...
...
@@ -121,6 +121,8 @@ module DiffHelper
def
inline_diff_btn
params_copy
=
params
.
dup
params_copy
[
:view
]
=
'inline'
# Always use HTML to handle case where JSON diff rendered this button
params_copy
.
delete
(
:format
)
link_to
url_for
(
params_copy
),
id:
"commit-diff-viewtype"
,
class:
(
params
[
:view
]
!=
'parallel'
?
'btn btn-sm active'
:
'btn btn-sm'
)
do
'Inline'
...
...
@@ -130,6 +132,8 @@ module DiffHelper
def
parallel_diff_btn
params_copy
=
params
.
dup
params_copy
[
:view
]
=
'parallel'
# Always use HTML to handle case where JSON diff rendered this button
params_copy
.
delete
(
:format
)
link_to
url_for
(
params_copy
),
id:
"commit-diff-viewtype"
,
class:
(
params
[
:view
]
==
'parallel'
?
'btn active btn-sm'
:
'btn btn-sm'
)
do
'Side-by-side'
...
...
This diff is collapsed.
Click to expand it.
app/views/users/calendar.html.haml
View file @
b8164321
...
...
@@ -4,7 +4,7 @@
%small
Issues, merge requests and push events
#cal-heatmap
.calendar
:javascript
new
c
alendar
(
new
C
alendar
(
#{
@timestamps
.
to_json
}
,
#{
@starting_year
}
,
#{
@starting_month
}
,
...
...
This diff is collapsed.
Click to expand it.
features/project/merge_requests.feature
View file @
b8164321
...
...
@@ -166,6 +166,13 @@ Feature: Project Merge Requests
And
I click Side-by-side Diff tab
Then
I should see comments on the side-by-side diff page
@javascript
Scenario
:
I
view diffs on a merge request
Given
project
"Shop"
have
"Bug NS-05"
open merge request with diffs inside
And
I visit merge request page
"Bug NS-05"
And
I click on the Changes tab via Javascript
Then
I should see the proper Inline and Side-by-side links
# Task status in issues list
Scenario
:
Merge requests list should display task status
...
...
This diff is collapsed.
Click to expand it.
features/steps/project/merge_requests.rb
View file @
b8164321
...
...
@@ -117,6 +117,20 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
visit
diffs_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
step
'I click on the Changes tab via Javascript'
do
find
(
'.diffs-tab'
).
click
sleep
2
end
step
'I should see the proper Inline and Side-by-side links'
do
buttons
=
all
(
'#commit-diff-viewtype'
)
expect
(
buttons
.
count
).
to
eq
(
2
)
buttons
.
each
do
|
b
|
expect
(
b
[
'href'
]).
should_not
have_content
(
'json'
)
end
end
step
'I switch to the merge request\'s comments tab'
do
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
...
...
This diff is collapsed.
Click to expand it.
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