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
127836dd
Commit
127836dd
authored
Oct 23, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix small CI UI regressions
parent
0e73d7b6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
8 deletions
+15
-8
CHANGELOG
CHANGELOG
+2
-0
app/assets/javascripts/ci/build.coffee
app/assets/javascripts/ci/build.coffee
+1
-1
app/controllers/projects/builds_controller.rb
app/controllers/projects/builds_controller.rb
+5
-4
app/models/commit_status.rb
app/models/commit_status.rb
+0
-1
app/views/ci/lints/_create.html.haml
app/views/ci/lints/_create.html.haml
+6
-1
app/views/projects/builds/show.html.haml
app/views/projects/builds/show.html.haml
+1
-1
No files found.
CHANGELOG
View file @
127836dd
...
@@ -22,6 +22,8 @@ v 8.1.0
...
@@ -22,6 +22,8 @@ v 8.1.0
- Fix error preventing displaying of commit data for a directory with a leading dot (Stan Hu)
- Fix error preventing displaying of commit data for a directory with a leading dot (Stan Hu)
- Speed up load times of issue detail pages by roughly 1.5x
- Speed up load times of issue detail pages by roughly 1.5x
- Require CI jobs to be named
- Require CI jobs to be named
- Fix CI rendering regressions
- Allow developer to manage builds
- If a merge request is to close an issue, show this on the issue page (Zeger-Jan van de Weg)
- If a merge request is to close an issue, show this on the issue page (Zeger-Jan van de Weg)
- Add a system note and update relevant merge requests when a branch is deleted or re-added (Stan Hu)
- Add a system note and update relevant merge requests when a branch is deleted or re-added (Stan Hu)
- Make diff file view easier to use on mobile screens (Stan Hu)
- Make diff file view easier to use on mobile screens (Stan Hu)
...
...
app/assets/javascripts/ci/build.coffee
View file @
127836dd
...
@@ -31,7 +31,7 @@ class CiBuild
...
@@ -31,7 +31,7 @@ class CiBuild
$
(
'#build-trace code'
).
html
build
.
trace_html
$
(
'#build-trace code'
).
html
build
.
trace_html
$
(
'#build-trace code'
).
append
'<i class="fa fa-refresh fa-spin"/>'
$
(
'#build-trace code'
).
append
'<i class="fa fa-refresh fa-spin"/>'
@
checkAutoscroll
()
@
checkAutoscroll
()
else
else
if
build
.
status
!=
build_status
Turbolinks
.
visit
build_url
Turbolinks
.
visit
build_url
,
4000
,
4000
...
...
app/controllers/projects/builds_controller.rb
View file @
127836dd
...
@@ -9,16 +9,17 @@ class Projects::BuildsController < Projects::ApplicationController
...
@@ -9,16 +9,17 @@ class Projects::BuildsController < Projects::ApplicationController
def
index
def
index
@scope
=
params
[
:scope
]
@scope
=
params
[
:scope
]
@all_builds
=
project
.
ci_builds
@all_builds
=
project
.
ci_builds
@builds
=
@all_builds
.
order
(
'created_at DESC'
)
@builds
=
@builds
=
case
@scope
case
@scope
when
'all'
when
'all'
@
all_
builds
@builds
when
'finished'
when
'finished'
@
all_
builds
.
finished
@builds
.
finished
else
else
@
all_builds
.
running_or_pending
@
builds
.
running_or_pending
.
reverse_order
end
end
@builds
=
@builds
.
order
(
'created_at DESC'
).
page
(
params
[
:page
]).
per
(
30
)
@builds
=
@builds
.
page
(
params
[
:page
]).
per
(
30
)
end
end
def
cancel_all
def
cancel_all
...
...
app/models/commit_status.rb
View file @
127836dd
...
@@ -20,7 +20,6 @@ class CommitStatus < ActiveRecord::Base
...
@@ -20,7 +20,6 @@ class CommitStatus < ActiveRecord::Base
scope
:latest
,
->
{
where
(
id:
unscope
(
:select
).
select
(
'max(id)'
).
group
(
:name
,
:ref
))
}
scope
:latest
,
->
{
where
(
id:
unscope
(
:select
).
select
(
'max(id)'
).
group
(
:name
,
:ref
))
}
scope
:ordered
,
->
{
order
(
:ref
,
:stage_idx
,
:name
)
}
scope
:ordered
,
->
{
order
(
:ref
,
:stage_idx
,
:name
)
}
scope
:for_ref
,
->
(
ref
)
{
where
(
ref:
ref
)
}
scope
:for_ref
,
->
(
ref
)
{
where
(
ref:
ref
)
}
scope
:running_or_pending
,
->
{
where
(
status:
[
:running
,
:pending
])
}
state_machine
:status
,
initial: :pending
do
state_machine
:status
,
initial: :pending
do
event
:run
do
event
:run
do
...
...
app/views/ci/lints/_create.html.haml
View file @
127836dd
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
%td
#{
stage
.
capitalize
}
Job -
#{
build
[
:name
]
}
%td
#{
stage
.
capitalize
}
Job -
#{
build
[
:name
]
}
%td
%td
%pre
%pre
=
simple_format
build
[
:
script
]
=
simple_format
build
[
:
commands
]
%br
%br
%b
Tag list:
%b
Tag list:
...
@@ -28,6 +28,11 @@
...
@@ -28,6 +28,11 @@
%br
%br
%b
Refs except:
%b
Refs except:
=
build
[
:except
]
&&
build
[
:except
].
join
(
", "
)
=
build
[
:except
]
&&
build
[
:except
].
join
(
", "
)
%br
%b
When:
=
build
[
:when
]
-
if
build
[
:allow_failure
]
%b
Allowed to fail
-
else
-
else
%p
%p
...
...
app/views/projects/builds/show.html.haml
View file @
127836dd
...
@@ -155,7 +155,7 @@
...
@@ -155,7 +155,7 @@
-
if
@builds
.
present?
-
if
@builds
.
present?
.build-widget
.build-widget
%h4
.title
#{
pluralize
(
@builds
.
count
,
"other build"
)
}
for
#{
@build
.
short_sha
}
:
%h4
.title
#{
pluralize
(
@builds
.
count
(
:id
)
,
"other build"
)
}
for
#{
@build
.
short_sha
}
:
%table
.table.builds
%table
.table.builds
-
@builds
.
each_with_index
do
|
build
,
i
|
-
@builds
.
each_with_index
do
|
build
,
i
|
%tr
.build
%tr
.build
...
...
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