BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 0bbf47da by Jacob Schatz
Options

Merge branch 'cleanup-coffeescripts-from-gitlab-ci' into 'master'

Clean up coffeescript files imported from GitLab CI ## What does this MR do? This MR cleans up CoffeeScript files imported from GitLab CI along with a strategy #19159. Some files should have been removed in !1987. ## Are there points in the code the reviewer needs to double check? While I think the `Build` module should be named as `Build`, not `CiBuild` in the JavaScript namespace, please check if it should. ## Why was this MR needed? Removing unused coffeescript files reduces time to build JS and so time to transfer even in production. The fewer files, the better, too. ## What are the relevant issue numbers? Closes #19159 ## Screenshots (if relevant) n/a ## Does this MR meet the acceptance criteria? - [skipped] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [skipped] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [skipped] API support added - Tests - [skipped] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4925
parents 734e44ee 1569dfd6
Showing with 4 additions and 20 deletions
app/assets/javascripts/application.js.coffee
......@@ -47,7 +47,6 @@
#= require date.format
#= require_directory ./behaviors
#= require_directory ./blob
#= require_directory ./ci
#= require_directory ./commit
#= require_directory ./extensions
#= require_directory ./lib/utils
......
app/assets/javascripts/ci/build.coffee → app/assets/javascripts/build.coffee
class @CiBuild
class @Build
@interval: null
@state: null
constructor: (@page_url, @build_url, @build_status, @state) ->
clearInterval(CiBuild.interval)
clearInterval(Build.interval)
# Init breakpoint checker
@bp = Breakpoints.get()
......@@ -40,7 +40,7 @@ class @CiBuild
# Check for new build output if user still watching build page
# Only valid for runnig build when output changes during time
#
CiBuild.interval = setInterval =>
Build.interval = setInterval =>
if window.location.href.split("#").first() is @page_url
@getBuildTrace()
, 4000
......
app/assets/javascripts/ci/application.js.coffee deleted 100644 → 0
#= require pager
#= require jquery_nested_form
#= require_tree .
$(document).on 'click', '.assign-all-runner', ->
$(this).replaceWith('<i class="fa fa-refresh fa-spin"></i> Assign in progress..')
window.unbindEvents = ->
$(document).unbind('scroll')
$(document).off('scroll')
document.addEventListener("page:fetch", unbindEvents)
app/assets/javascripts/ci/projects.js.coffee deleted 100644 → 0
$(document).on 'click', '.badge-codes-toggle', ->
$('.badge-codes-block').toggleClass("hide")
return false
app/views/projects/builds/show.html.haml
......@@ -67,4 +67,4 @@
= render "sidebar"
:javascript
new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{namespace_project_build_url(@project.namespace, @project, @build, :json)}", "#{@build.status}", "#{trace_with_state[:state]}")
new Build("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{namespace_project_build_url(@project.namespace, @project, @build, :json)}", "#{@build.status}", "#{trace_with_state[:state]}")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment