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
iv
gitlab-ce
Commits
eecd8971
Commit
eecd8971
authored
Mar 24, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix code unfold not working on Compare commits page
Closes #1274
parent
c3c97034
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
0 deletions
+20
-0
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+4
-0
features/project/commits/commits.feature
features/project/commits/commits.feature
+3
-0
features/steps/project/commits/commits.rb
features/steps/project/commits/commits.rb
+12
-0
No files found.
CHANGELOG
View file @
eecd8971
Please view this file on the master branch, on stable branches it's out of date.
Please view this file on the master branch, on stable branches it's out of date.
v 7.10.0 (unreleased)
v 7.10.0 (unreleased)
- 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)
- Include missing events and fix save functionality in admin service template settings form (Stan Hu)
- Fix "Import projects from" button to show the correct instructions (Stan Hu)
- Fix "Import projects from" button to show the correct instructions (Stan Hu)
- Fix dots in Wiki slugs causing errors (Stan Hu)
- Fix dots in Wiki slugs causing errors (Stan Hu)
...
...
app/assets/javascripts/dispatcher.js.coffee
View file @
eecd8971
...
@@ -28,6 +28,8 @@ class Dispatcher
...
@@ -28,6 +28,8 @@ class Dispatcher
new
Milestone
()
new
Milestone
()
when
'projects:milestones:new'
,
'projects:milestones:edit'
when
'projects:milestones:new'
,
'projects:milestones:edit'
new
ZenMode
()
new
ZenMode
()
when
'projects:compare:show'
new
Diff
()
when
'projects:issues:new'
,
'projects:issues:edit'
when
'projects:issues:new'
,
'projects:issues:edit'
GitLab
.
GfmAutoComplete
.
setup
()
GitLab
.
GfmAutoComplete
.
setup
()
shortcut_handler
=
new
ShortcutsNavigation
()
shortcut_handler
=
new
ShortcutsNavigation
()
...
@@ -115,6 +117,8 @@ class Dispatcher
...
@@ -115,6 +117,8 @@ class Dispatcher
new
Project
()
new
Project
()
new
ProjectAvatar
()
new
ProjectAvatar
()
switch
path
[
1
]
switch
path
[
1
]
when
'compare'
shortcut_handler
=
new
ShortcutsNavigation
()
when
'edit'
when
'edit'
shortcut_handler
=
new
ShortcutsNavigation
()
shortcut_handler
=
new
ShortcutsNavigation
()
new
ProjectNew
()
new
ProjectNew
()
...
...
features/project/commits/commits.feature
View file @
eecd8971
...
@@ -21,10 +21,13 @@ Feature: Project Commits
...
@@ -21,10 +21,13 @@ Feature: Project Commits
And
I click side-by-side diff button
And
I click side-by-side diff button
Then
I see inline diff button
Then
I see inline diff button
@javascript
Scenario
:
I
compare refs
Scenario
:
I
compare refs
Given
I visit compare refs page
Given
I visit compare refs page
And
I fill compare fields with refs
And
I fill compare fields with refs
Then
I see compared refs
Then
I see compared refs
And
I unfold diff
Then
I should see additional file lines
Scenario
:
I
browse commits for a specific path
Scenario
:
I
browse commits for a specific path
Given
I visit my project's commits page for a specific path
Given
I visit my project's commits page for a specific path
...
...
features/steps/project/commits/commits.rb
View file @
eecd8971
...
@@ -38,6 +38,18 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
...
@@ -38,6 +38,18 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
click_button
"Compare"
click_button
"Compare"
end
end
step
'I unfold diff'
do
@diff
=
first
(
'.js-unfold'
)
@diff
.
click
sleep
2
end
step
'I should see additional file lines'
do
within
@diff
.
parent
do
first
(
'.new_line'
).
text
.
should_not
have_content
"..."
end
end
step
'I see compared refs'
do
step
'I see compared refs'
do
page
.
should
have_content
"Compare View"
page
.
should
have_content
"Compare View"
page
.
should
have_content
"Commits (1)"
page
.
should
have_content
"Commits (1)"
...
...
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