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
357e0764
Commit
357e0764
authored
Oct 22, 2015
by
Robert Speicher
Committed by
Robert Speicher
Oct 22, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'fix-build-trace-updating' into 'master'
Fix build trace updating Fixes #2910 See merge request !1657
parent
8e65f91e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/ci/build.coffee
app/assets/javascripts/ci/build.coffee
+1
-1
app/views/projects/builds/show.html.haml
app/views/projects/builds/show.html.haml
+1
-1
No files found.
CHANGELOG
View file @
357e0764
...
...
@@ -22,6 +22,7 @@ v 8.1.0 (unreleased)
- Remove CI migration task
- Improved performance of finding projects by their namespace
- Fix bug where transferring a project would result in stale commit links (Stan Hu)
- Fix build trace updating
- Include full path of source and target branch names in New Merge Request page (Stan Hu)
- Add user preference to view activities as default dashboard (Stan Hu)
- Add option to admin area to sign in as a specific user (Pavel Forkert)
...
...
app/assets/javascripts/ci/build.coffee
View file @
357e0764
...
...
@@ -22,7 +22,7 @@ class CiBuild
# Only valid for runnig build when output changes during time
#
CiBuild
.
interval
=
setInterval
=>
if
window
.
location
.
href
is
build_url
if
window
.
location
.
href
.
split
(
"#"
).
first
()
is
build_url
$
.
ajax
url
:
build_url
dataType
:
"json"
...
...
app/views/projects/builds/show.html.haml
View file @
357e0764
...
...
@@ -175,4 +175,4 @@
:javascript
new
CiBuild
(
"
#{
namespace_project_build_
path
(
@project
.
namespace
,
@project
,
@build
)
}
"
,
"
#{
@build
.
status
}
"
)
new
CiBuild
(
"
#{
namespace_project_build_
url
(
@project
.
namespace
,
@project
,
@build
)
}
"
,
"
#{
@build
.
status
}
"
)
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