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
7c8c8088
Commit
7c8c8088
authored
Oct 06, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'akramfares/gitlab-ce-master'
See !6543.
parents
21f0c27a
5c7904d7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
0 deletions
+16
-0
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+2
-0
features/project/commits/commits.feature
features/project/commits/commits.feature
+5
-0
features/steps/project/commits/commits.rb
features/steps/project/commits/commits.rb
+8
-0
No files found.
CHANGELOG
View file @
7c8c8088
...
@@ -10,6 +10,7 @@ v 8.13.0 (unreleased)
...
@@ -10,6 +10,7 @@ v 8.13.0 (unreleased)
- Add a /wip slash command to toggle the Work In Progress status of a merge request. !6259 (tbalthazar)
- Add a /wip slash command to toggle the Work In Progress status of a merge request. !6259 (tbalthazar)
- Speed-up group milestones show page
- Speed-up group milestones show page
- Don't include archived projects when creating group milestones. !4940 (Jeroen Jacobs)
- Don't include archived projects when creating group milestones. !4940 (Jeroen Jacobs)
- Add tag shortcut from the Commit page. !6543
- Keep refs for each deployment
- Keep refs for each deployment
- Log LDAP lookup errors and don't swallow unrelated exceptions. !6103 (Markus Koller)
- Log LDAP lookup errors and don't swallow unrelated exceptions. !6103 (Markus Koller)
- Add more tests for calendar contribution (ClemMakesApps)
- Add more tests for calendar contribution (ClemMakesApps)
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
7c8c8088
...
@@ -24,6 +24,8 @@
...
@@ -24,6 +24,8 @@
=
revert_commit_link
(
@commit
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
has_tooltip:
false
)
=
revert_commit_link
(
@commit
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
has_tooltip:
false
)
%li
.clearfix
%li
.clearfix
=
cherry_pick_commit_link
(
@commit
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
has_tooltip:
false
)
=
cherry_pick_commit_link
(
@commit
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
has_tooltip:
false
)
%li
.clearfix
=
link_to
"Tag"
,
new_namespace_project_tag_path
(
@project
.
namespace
,
@project
,
ref:
@commit
)
%li
.divider
%li
.divider
%li
.dropdown-header
%li
.dropdown-header
Download
Download
...
...
features/project/commits/commits.feature
View file @
7c8c8088
...
@@ -37,6 +37,11 @@ Feature: Project Commits
...
@@ -37,6 +37,11 @@ Feature: Project Commits
Then
I see commit info
Then
I see commit info
And
I see side-by-side diff button
And
I see side-by-side diff button
Scenario
:
I
browse commit from list and create a new tag
Given
I click on commit link
And
I click on tag link
Then
I see commit SHA pre-filled
Scenario
:
I
browse commit with ci from list
Scenario
:
I
browse commit with ci from list
Given
commit has ci status
Given
commit has ci status
And
repository contains
".gitlab-ci.yml"
file
And
repository contains
".gitlab-ci.yml"
file
...
...
features/steps/project/commits/commits.rb
View file @
7c8c8088
...
@@ -24,6 +24,14 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
...
@@ -24,6 +24,14 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
expect
(
body
).
to
have_selector
(
"entry summary"
,
text:
commit
.
description
[
0
..
10
])
expect
(
body
).
to
have_selector
(
"entry summary"
,
text:
commit
.
description
[
0
..
10
])
end
end
step
'I click on tag link'
do
click_link
"Tag"
end
step
'I see commit SHA pre-filled'
do
expect
(
page
).
to
have_selector
(
"input[value='
#{
sample_commit
.
id
}
']"
)
end
step
'I click on commit link'
do
step
'I click on commit link'
do
visit
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
sample_commit
.
id
)
visit
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
sample_commit
.
id
)
end
end
...
...
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