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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
18fdbf0a
Commit
18fdbf0a
authored
May 11, 2016
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a description for default scope on builds
parent
95163307
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
2 deletions
+5
-2
CHANGELOG
CHANGELOG
+1
-0
app/views/admin/builds/index.html.haml
app/views/admin/builds/index.html.haml
+1
-1
app/views/projects/builds/index.html.haml
app/views/projects/builds/index.html.haml
+1
-1
spec/features/admin/admin_builds_spec.rb
spec/features/admin/admin_builds_spec.rb
+1
-0
spec/features/builds_spec.rb
spec/features/builds_spec.rb
+1
-0
No files found.
CHANGELOG
View file @
18fdbf0a
...
@@ -51,6 +51,7 @@ v 8.7.5
...
@@ -51,6 +51,7 @@ v 8.7.5
- Fix relative links in wiki pages. !4050
- Fix relative links in wiki pages. !4050
- Fix always showing build notification message when switching between merge requests !4086
- Fix always showing build notification message when switching between merge requests !4086
- Fix an issue when filtering merge requests with more than one label. !3886
- Fix an issue when filtering merge requests with more than one label. !3886
- Fix short note for the default scope on build page (Takuya Noguchi)
v 8.7.4
v 8.7.4
- Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
- Links for Redmine issue references are generated correctly again !4048 (Benedikt Huss)
...
...
app/views/admin/builds/index.html.haml
View file @
18fdbf0a
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
=
link_to
'Cancel all'
,
cancel_all_admin_builds_path
,
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :post
=
link_to
'Cancel all'
,
cancel_all_admin_builds_path
,
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :post
.row-content-block.second-block
.row-content-block.second-block
#{
(
@scope
||
'
running
'
).
capitalize
}
builds
#{
(
@scope
||
'
all
'
).
capitalize
}
builds
%ul
.content-list
%ul
.content-list
-
if
@builds
.
blank?
-
if
@builds
.
blank?
...
...
app/views/projects/builds/index.html.haml
View file @
18fdbf0a
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
%span
CI Lint
%span
CI Lint
.row-content-block
.row-content-block
#{
(
@scope
||
'
running
'
).
capitalize
}
builds from this project
#{
(
@scope
||
'
all
'
).
capitalize
}
builds from this project
%ul
.content-list
%ul
.content-list
-
if
@builds
.
blank?
-
if
@builds
.
blank?
...
...
spec/features/admin/admin_builds_spec.rb
View file @
18fdbf0a
...
@@ -19,6 +19,7 @@ describe 'Admin Builds' do
...
@@ -19,6 +19,7 @@ describe 'Admin Builds' do
visit
admin_builds_path
visit
admin_builds_path
expect
(
page
).
to
have_selector
(
'.nav-links li.active'
,
text:
'All'
)
expect
(
page
).
to
have_selector
(
'.nav-links li.active'
,
text:
'All'
)
expect
(
page
).
to
have_selector
(
'.row-content-block'
,
text:
'All builds'
)
expect
(
page
.
all
(
'.build-link'
).
size
).
to
eq
(
4
)
expect
(
page
.
all
(
'.build-link'
).
size
).
to
eq
(
4
)
expect
(
page
).
to
have_link
'Cancel all'
expect
(
page
).
to
have_link
'Cancel all'
end
end
...
...
spec/features/builds_spec.rb
View file @
18fdbf0a
...
@@ -43,6 +43,7 @@ describe "Builds" do
...
@@ -43,6 +43,7 @@ describe "Builds" do
end
end
it
{
expect
(
page
).
to
have_selector
(
'.nav-links li.active'
,
text:
'All'
)
}
it
{
expect
(
page
).
to
have_selector
(
'.nav-links li.active'
,
text:
'All'
)
}
it
{
expect
(
page
).
to
have_selector
(
'.row-content-block'
,
text:
'All builds from this project'
)
}
it
{
expect
(
page
).
to
have_content
@build
.
short_sha
}
it
{
expect
(
page
).
to
have_content
@build
.
short_sha
}
it
{
expect
(
page
).
to
have_content
@build
.
ref
}
it
{
expect
(
page
).
to
have_content
@build
.
ref
}
it
{
expect
(
page
).
to
have_content
@build
.
name
}
it
{
expect
(
page
).
to
have_content
@build
.
name
}
...
...
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