BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
33748960
Commit
33748960
authored
May 29, 2017
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check for Merge Request fixed
Fixed couple of spinach test
parent
6709e65c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+2
-1
_new_dropdown.haml
app/views/layouts/header/_new_dropdown.haml
+1
-1
merge_requests.rb
features/steps/project/merge_requests.rb
+3
-1
snippets.rb
features/steps/project/snippets.rb
+3
-1
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
33748960
...
...
@@ -267,7 +267,8 @@
padding
:
0
16px
;
}
.separator
+
.dropdown-header
,
.separator
+
.dropdown-bold-header
{
.separator
+
.dropdown-header
,
.separator
+
.dropdown-bold-header
{
padding-top
:
2px
;
}
...
...
app/views/layouts/header/_new_dropdown.haml
View file @
33748960
...
...
@@ -22,7 +22,7 @@
-
create_project_issue
=
can?
(
current_user
,
:create_issue
,
@project
)
-
merge_project
=
can?
(
current_user
,
:create_merge_request
,
@project
)
?
@project
:
(
current_user
&&
current_user
.
fork_of
(
@project
))
-
create_project_snippet
=
can?
(
current_user
,
:create_project_snippet
,
@project
)
-
if
(
create_project_issue
||
create_project_mr
||
create_project_snippet
)
-
if
(
create_project_issue
||
merge_project
||
create_project_snippet
)
%li
.dropdown-bold-header
This project
-
if
create_project_issue
%li
...
...
features/steps/project/merge_requests.rb
View file @
33748960
...
...
@@ -14,7 +14,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step
'I click link "New Merge Request"'
do
page
.
has_link?
(
'New Merge Request'
)
?
click_link
(
"New Merge Request"
)
:
click_link
(
'New merge request'
)
page
.
within
'#content-body'
do
page
.
has_link?
(
'New Merge Request'
)
?
click_link
(
"New Merge Request"
)
:
click_link
(
'New merge request'
)
end
end
step
'I click link "Bug NS-04"'
do
...
...
features/steps/project/snippets.rb
View file @
33748960
...
...
@@ -23,7 +23,9 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
end
step
'I click link "New snippet"'
do
first
(
:link
,
"New snippet"
).
click
page
.
within
'#content-body'
do
first
(
:link
,
"New snippet"
).
click
end
end
step
'I click link "Snippet one"'
do
...
...
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