diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-09 09:00:25 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-09 09:00:25 +0100 |
commit | eab086bde11f30551b4a8b27b0a344e654924a1c (patch) | |
tree | 89e290bacbad9765560c7673344919a6b44ca02c /app/assets | |
parent | 1464a69c76cf492ad8b9674e24260e917dc7d2ef (diff) | |
parent | ee0ab46d327e278af68cbda49e00cd5188c709f3 (diff) | |
download | gitlab-ce-eab086bde11f30551b4a8b27b0a344e654924a1c.tar.gz |
Merge branch 'master' into merge-if-green
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# config/routes.rb
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 22 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 |
2 files changed, 25 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 593a8f42130..b0eeb1db536 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -43,6 +43,7 @@ # class @MergeRequestTabs diffsLoaded: false + buildsLoaded: false commitsLoaded: false constructor: (@opts = {}) -> @@ -54,6 +55,12 @@ class @MergeRequestTabs bindEvents: -> $(document).on 'shown.bs.tab', '.merge-request-tabs a[data-toggle="tab"]', @tabShown + $(document).on 'click', '.js-show-tab', @showTab + + showTab: (event) => + event.preventDefault() + + @activateTab $(event.target).data('action') tabShown: (event) => $target = $(event.target) @@ -63,6 +70,8 @@ class @MergeRequestTabs @loadCommits($target.attr('href')) else if action == 'diffs' @loadDiff($target.attr('href')) + else if action == 'builds' + @loadBuilds($target.attr('href')) @setCurrentAction(action) @@ -101,7 +110,7 @@ class @MergeRequestTabs action = 'notes' if action == 'show' # Remove a trailing '/commits' or '/diffs' - new_state = @_location.pathname.replace(/\/(commits|diffs)(\.html)?\/?$/, '') + new_state = @_location.pathname.replace(/\/(commits|diffs|builds)(\.html)?\/?$/, '') # Append the new action if we're on a tab other than 'notes' unless action == 'notes' @@ -139,6 +148,17 @@ class @MergeRequestTabs @diffsLoaded = true @scrollToElement("#diffs") + loadBuilds: (source) -> + return if @buildsLoaded + + @_get + url: "#{source}.json" + success: (data) => + document.getElementById('builds').innerHTML = data.html + $('.js-timeago').timeago() + @buildsLoaded = true + @scrollToElement("#builds") + # Show or hide the loading spinner # # status - Boolean, true to show, false to hide diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index a2b935dc618..fc8c7161991 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -83,6 +83,10 @@ &.ci-error { color: $gl-danger; } + + a.monospace { + color: inherit; + } } .mr-widget-body, |