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
e5c865ee
Commit
e5c865ee
authored
Dec 03, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
e41a0c60
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
25 deletions
+14
-25
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+11
-0
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+0
-11
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+0
-11
app/views/shared/issuable/_context.html.haml
app/views/shared/issuable/_context.html.haml
+1
-1
features/steps/project/forked_merge_requests.rb
features/steps/project/forked_merge_requests.rb
+1
-1
features/steps/project/issues/issues.rb
features/steps/project/issues/issues.rb
+1
-1
No files found.
app/assets/stylesheets/pages/issuable.scss
View file @
e5c865ee
...
@@ -90,6 +90,17 @@
...
@@ -90,6 +90,17 @@
}
}
}
}
.issuable-show-labels
{
a
{
margin-right
:
5px
;
margin-bottom
:
5px
;
display
:
inline-block
;
.color-label
{
padding
:
6px
10px
;
}
}
}
.cross-project-reference
{
.cross-project-reference
{
text-align
:
center
;
text-align
:
center
;
width
:
100%
;
width
:
100%
;
...
...
app/assets/stylesheets/pages/issues.scss
View file @
e5c865ee
...
@@ -56,17 +56,6 @@
...
@@ -56,17 +56,6 @@
}
}
}
}
.issue-show-labels
{
a
{
margin-right
:
5px
;
margin-bottom
:
5px
;
display
:
inline-block
;
.color-label
{
padding
:
6px
10px
;
}
}
}
form
.edit-issue
{
form
.edit-issue
{
margin
:
0
;
margin
:
0
;
}
}
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
e5c865ee
...
@@ -183,17 +183,6 @@
...
@@ -183,17 +183,6 @@
display
:
none
;
display
:
none
;
}
}
.merge-request-show-labels
{
a
{
margin-right
:
5px
;
margin-bottom
:
5px
;
display
:
inline-block
;
.color-label
{
padding
:
6px
10px
;
}
}
}
.merge-request-form
.select2-container
{
.merge-request-form
.select2-container
{
width
:
250px
!
important
;
width
:
250px
!
important
;
}
}
...
...
app/views/shared/issuable/_context.html.haml
View file @
e5c865ee
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
%div
.prepend-top-default.clearfix
%div
.prepend-top-default.clearfix
.issuable-context-title
.issuable-context-title
%label
Labels
%label
Labels
.
merge-request
-show-labels
.
issuable
-show-labels
-
issuable
.
labels
.
each
do
|
label
|
-
issuable
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
)
=
link_to_label
(
label
)
...
...
features/steps/project/forked_merge_requests.rb
View file @
e5c865ee
...
@@ -115,7 +115,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
...
@@ -115,7 +115,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
expect
(
find
(
:select
,
"merge_request_source_project_id"
,
{}).
value
).
to
eq
@forked_project
.
id
.
to_s
expect
(
find
(
:select
,
"merge_request_source_project_id"
,
{}).
value
).
to
eq
@forked_project
.
id
.
to_s
expect
(
find
(
:select
,
"merge_request_target_project_id"
,
{}).
value
).
to
eq
@project
.
id
.
to_s
expect
(
find
(
:select
,
"merge_request_target_project_id"
,
{}).
value
).
to
eq
@project
.
id
.
to_s
expect
(
find
(
:select
,
"merge_request_source_branch"
,
{}).
value
).
to
eq
""
expect
(
find
(
:select
,
"merge_request_source_branch"
,
{}).
value
).
to
eq
""
expect
(
find
(
:select
,
"merge_request_target_branch"
,
{}).
value
).
to
eq
""
expect
(
find
(
:select
,
"merge_request_target_branch"
,
{}).
value
).
to
eq
"
master
"
click_button
"Compare branches"
click_button
"Compare branches"
end
end
...
...
features/steps/project/issues/issues.rb
View file @
e5c865ee
...
@@ -86,7 +86,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
...
@@ -86,7 +86,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end
end
step
'I should see label \'bug\' with issue'
do
step
'I should see label \'bug\' with issue'
do
page
.
within
'.issue-show-labels'
do
page
.
within
'.issu
abl
e-show-labels'
do
expect
(
page
).
to
have_content
'bug'
expect
(
page
).
to
have_content
'bug'
end
end
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