Merge branch 'master' into notification-levels

.gitignore

@@ -20,12 +20,13 @@ backups/*
 config/aws.yml
 config/database.yml
 config/gitlab.yml
-config/initializers/omniauth.rb
+config/gitlab_ci.yml
 config/initializers/rack_attack.rb
 config/initializers/smtp_settings.rb
 config/resque.yml
 config/unicorn.rb
 config/mail_room.yml
+config/secrets.yml
 coverage/*
 db/*.sqlite3
 db/*.sqlite3-journal
@@ -41,3 +42,4 @@ rails_best_practices_output.html
 /tags
 tmp/
 vendor/bundle/*
+builds/*

.rubocop.yml

@@ -998,7 +998,9 @@ AllCops:
     - 'tmp/**/*'
     - 'bin/**/*'
     - 'lib/backup/**/*'
+    - 'lib/ci/backup/**/*'
     - 'lib/tasks/**/*'
+    - 'lib/ci/migrate/**/*'
     - 'lib/email_validator.rb'
     - 'lib/gitlab/upgrader.rb'
     - 'lib/gitlab/seeder.rb'

CHANGELOG

 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
+  - Fix broken sort in merge request API (Stan Hu)
   - Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs (Stan Hu)
   - Gracefully handle errors in syntax highlighting by leaving the block unformatted (Stan Hu)
+  - Add "replace" and "upload" functionalities to allow user replace existing file and upload new file into current repository
   - Fix URL construction for merge requests, issues, notes, and commits for relative URL config (Stan Hu)
   - Fix emoji URLs in Markdown when relative_url_root is used (Stan Hu)
   - Omit filename in Content-Disposition header in raw file download to avoid RFC 6266 encoding issues (Stan HU)
@@ -48,12 +50,14 @@ v 8.0.0 (unreleased)
   - Project notification level can be set on the project page itself
   - Added service API endpoint to retrieve service parameters (Petheő Bence)
   - Add FogBugz project import (Jared Szechy)
+  - Sort users autocomplete lists by user (Allister Antosik)
 
 v 7.14.3
   - No changes
 
 v 7.14.2
   - Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files (Stan Hu)
+  - Allow configuration of LDAP attributes GitLab will use for the new user account.
 
 v 7.14.1
   - Improve abuse reports management from admin area

Gemfile

 source "https://rubygems.org"
 
-gem 'rails', '4.1.11'
+def darwin_only(require_as)
+  RUBY_PLATFORM.include?('darwin') && require_as
+end
+
+def linux_only(require_as)
+  RUBY_PLATFORM.include?('linux') && require_as
+end
+
+gem 'rails', '4.1.12'
 
 # Specify a sprockets version due to security issue
 # See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
@@ -10,29 +18,29 @@ gem 'sprockets', '~> 2.12.3'
 gem "default_value_for", "~> 3.0.0"
 
 # Supported DBs
-gem "mysql2", group: :mysql
-gem "pg", group: :postgres
+gem "mysql2", '~> 0.3.16', group: :mysql
+gem "pg", '~> 0.18.2', group: :postgres
 
 # Authentication libraries
-gem "devise", '3.2.4'
-gem "devise-async", '0.9.0'
+gem "devise", '~> 3.2.4'
+gem "devise-async", '~> 0.9.0'
 gem 'omniauth', "~> 1.2.2"
-gem 'omniauth-google-oauth2'
-gem 'omniauth-twitter'
-gem 'omniauth-github'
-gem 'omniauth-shibboleth'
-gem 'omniauth-kerberos', group: :kerberos
-gem 'omniauth-gitlab'
-gem 'omniauth-bitbucket'
+gem 'omniauth-google-oauth2', '~> 0.2.5'
+gem 'omniauth-twitter', '~> 1.0.1'
+gem 'omniauth-github', '~> 1.1.1'
+gem 'omniauth-shibboleth', '~> 1.1.1'
+gem 'omniauth-kerberos', '~> 0.2.0', group: :kerberos
+gem 'omniauth-gitlab', '~> 1.0.0'
+gem 'omniauth-bitbucket', '~> 0.0.2'
 gem 'omniauth-saml', '~> 1.4.0'
+gem 'doorkeeper', '~> 2.1.3'
 gem 'omniauth_crowd'
-gem 'doorkeeper', '2.1.3'
 gem "rack-oauth2", "~> 1.0.5"
 
 # Two-factor authentication
-gem 'devise-two-factor'
-gem 'rqrcode-rails3'
-gem 'attr_encrypted', '1.3.4'
+gem 'devise-two-factor', '~> 1.0.1'
+gem 'rqrcode-rails3', '~> 0.1.7'
+gem 'attr_encrypted', '~> 1.3.4'
 
 # Browser detection
 gem "browser", '~> 1.0.0'
@@ -44,7 +52,7 @@ gem "gitlab_git", '~> 7.2.15'
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
 # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap"
+gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
 
 # Git Wiki
 gem 'gollum-lib', '~> 4.0.2'
@@ -59,47 +67,47 @@ gem "gitlab-linguist", "~> 3.0.1", require: "linguist"
 # API
 gem "grape", "~> 0.6.1"
 gem "grape-entity", "~> 0.4.2"
-gem 'rack-cors', require: 'rack/cors'
+gem 'rack-cors', '~> 0.2.9', require: 'rack/cors'
 
 # Format dates and times
 # based on human-friendly examples
-gem "stamp"
+gem "stamp", '~> 0.5.0'
 
 # Enumeration fields
-gem 'enumerize'
+gem 'enumerize', '~> 0.7.0'
 
 # Pagination
 gem "kaminari", "~> 0.15.1"
 
 # HAML
-gem "haml-rails"
+gem "haml-rails", '~> 0.5.3'
 
 # Files attachments
-gem "carrierwave"
+gem "carrierwave", '~> 0.9.0'
 
 # Drag and Drop UI
-gem 'dropzonejs-rails'
+gem 'dropzonejs-rails', '~> 0.7.1'
 
 # for aws storage
 gem "fog", "~> 1.25.0"
-gem "unf"
+gem "unf", '~> 0.1.4'
 
 # Authorization
-gem "six"
+gem "six", '~> 0.2.0'
 
 # Seed data
-gem "seed-fu"
+gem "seed-fu", '~> 2.3.5'
 
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 1.11.0'
-gem 'task_list',     '1.0.2', require: 'task_list/railtie'
-gem 'github-markup'
+gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
+gem 'github-markup', '~> 1.3.1'
 gem 'redcarpet',     '~> 3.3.2'
-gem 'RedCloth'
+gem 'RedCloth',      '~> 4.2.9'
 gem 'rdoc',          '~>3.6'
-gem 'org-ruby',      '= 0.9.12'
+gem 'org-ruby',      '~> 0.9.12'
 gem 'creole',        '~>0.3.6'
-gem 'wikicloth',     '=0.8.1'
+gem 'wikicloth',     '0.8.1'
 gem 'asciidoctor',   '~> 1.5.2'
 
 # Diffs
@@ -107,37 +115,38 @@ gem 'diffy', '~> 3.0.3'
 
 # Application server
 group :unicorn do
-  gem "unicorn", '~> 4.6.3'
-  gem 'unicorn-worker-killer'
+  gem "unicorn", '~> 4.8.2'
+  gem 'unicorn-worker-killer', '~> 0.4.2'
 end
 
 # State machine
-gem "state_machine"
+gem "state_machine", '~> 1.2.0'
 
 # Issue tags
 gem 'acts-as-taggable-on', '~> 3.4'
 
 # Background jobs
-gem 'slim'
-gem 'sinatra', require: nil
-gem 'sidekiq', '~> 3.3'
-gem 'sidetiq', '0.6.3'
+gem 'slim', '~> 2.0.2'
+gem 'sinatra', '~> 1.4.4', require: nil
+gem 'sidekiq', '3.3.0'
+gem 'sidetiq', '~> 0.6.3'
 
 # HTTP requests
-gem "httparty"
+gem "httparty", '~> 0.13.3'
 
 # Colored output to console
-gem "colored"
+gem "colored", '~> 1.2'
+gem "colorize", '~> 0.5.8'
 
 # GitLab settings
-gem 'settingslogic'
+gem 'settingslogic', '~> 2.0.9'
 
 # Misc
-gem "foreman"
-gem 'version_sorter'
+
+gem 'version_sorter', '~> 2.0.0'
 
 # Cache
-gem "redis-rails"
+gem "redis-rails", '~> 4.0.0'
 
 # Campfire integration
 gem 'tinder', '~> 1.9.2'
@@ -158,7 +167,7 @@ gem "slack-notifier", "~> 1.0.0"
 gem 'asana', '~> 0.0.6'
 
 # FogBugz integration
-gem 'ruby-fogbugz'
+gem 'ruby-fogbugz', '~> 0.2.1'
 
 # d3
 gem 'd3_rails', '~> 3.5.5'
@@ -176,69 +185,70 @@ gem "sanitize", '~> 2.0'
 gem "rack-attack", '~> 4.3.0'
 
 # Ace editor
-gem 'ace-rails-ap'
+gem 'ace-rails-ap', '~> 2.0.1'
 
 # Keyboard shortcuts
-gem 'mousetrap-rails'
+gem 'mousetrap-rails', '~> 1.4.6'
 
 # Detect and convert string character encoding
-gem 'charlock_holmes'
+gem 'charlock_holmes', '~> 0.6.9.4'
 
 gem "sass-rails", '~> 4.0.5'
-gem "coffee-rails"
-gem "uglifier"
+gem "coffee-rails", '~> 4.1.0'
+gem "uglifier", '~> 2.3.2'
 gem 'turbolinks', '~> 2.5.0'
-gem 'jquery-turbolinks'
+gem 'jquery-turbolinks', '~> 2.0.1'
 
-gem 'addressable'
+gem 'addressable',        '~> 2.3.8'
 gem 'bootstrap-sass',     '~> 3.0'
 gem 'font-awesome-rails', '~> 4.2'
 gem 'gitlab_emoji',       '~> 0.1'
 gem 'gon',                '~> 5.0.0'
 gem 'jquery-atwho-rails', '~> 1.0.0'
-gem 'jquery-rails',       '3.1.3'
-gem 'jquery-scrollto-rails'
-gem 'jquery-ui-rails'
-gem 'nprogress-rails'
+gem 'jquery-rails',       '~> 3.1.3'
+gem 'jquery-scrollto-rails', '~> 1.4.3'
+gem 'jquery-ui-rails',    '~> 4.2.1'
+gem 'nprogress-rails',    '~> 0.1.2.3'
 gem 'raphael-rails',      '~> 2.1.2'
-gem 'request_store'
+gem 'request_store',      '~> 1.2.0'
 gem 'select2-rails',      '~> 3.5.9'
-gem 'virtus'
+gem 'virtus',             '~> 1.0.1'
 
 group :development do
-  gem 'brakeman', require: false
-  gem "annotate", "~> 2.6.0.beta2"
-  gem "letter_opener"
-  gem 'quiet_assets', '~> 1.0.1'
-  gem 'rack-mini-profiler', require: false
+  gem "foreman"
+  gem 'brakeman', '3.0.1', require: false
+
+  gem "annotate", "~> 2.6.0"
+  gem "letter_opener", '~> 1.1.2'
+  gem 'quiet_assets', '~> 1.0.2'
+  gem 'rack-mini-profiler', '~> 0.9.0', require: false
   gem 'rerun', '~> 0.10.0'
 
   # Better errors handler
-  gem 'better_errors'
-  gem 'binding_of_caller'
+  gem 'better_errors', '~> 1.0.1'
+  gem 'binding_of_caller', '~> 0.7.2'
 
   # Docs generator
-  gem "sdoc"
+  gem "sdoc", '~> 0.3.20'
 
   # thin instead webrick
-  gem 'thin'
+  gem 'thin', '~> 1.6.1'
 end
 
 group :development, :test do
-  gem 'awesome_print'
   gem 'byebug', platform: :mri
-  gem 'fuubar', '~> 2.0.0'
   gem 'pry-rails'
 
-  gem 'coveralls',        '~> 0.8.2', require: false
+  gem 'awesome_print', '~> 1.2.0'
+  gem 'fuubar', '~> 2.0.0'
+
   gem 'database_cleaner', '~> 1.4.0'
-  gem 'factory_girl_rails'
+  gem 'factory_girl_rails', '~> 4.3.0'
   gem 'rspec-rails',      '~> 3.3.0'
-  gem 'rubocop',          '0.28.0',   require: false
-  gem 'spinach-rails'
+  gem 'spinach-rails', '~> 0.2.1'
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
-  gem 'minitest', '~> 5.3.0'
+  gem 'minitest', '~> 5.7.0'
 
   # Generate Fake data
   gem 'ffaker', '~> 2.0.0'
@@ -248,20 +258,23 @@ group :development, :test do
   gem 'poltergeist',         '~> 1.6.0'
 
   gem 'teaspoon', '~> 1.0.0'
-  gem 'teaspoon-jasmine'
+  gem 'teaspoon-jasmine', '~> 2.2.0'
 
-  gem 'spring', '~> 1.3.1'
-  gem 'spring-commands-rspec',    '~> 1.0.0'
+  gem 'spring', '~> 1.3.6'
+  gem 'spring-commands-rspec',    '~> 1.0.4'
   gem 'spring-commands-spinach',  '~> 1.0.0'
   gem 'spring-commands-teaspoon', '~> 0.0.2'
+
+  gem 'rubocop',  '~> 0.28.0',  require: false
+  gem 'coveralls',  '~> 0.8.2', require: false
+  gem 'simplecov', '~> 0.10.0', require: false
 end
 
 group :test do
-  gem 'simplecov', require: false
   gem 'shoulda-matchers', '~> 2.8.0', require: false
   gem 'email_spec', '~> 1.6.0'
   gem 'webmock', '~> 1.21.0'
-  gem 'test_after_commit'
+  gem 'test_after_commit', '~> 0.2.2'
   gem 'sham_rack'
 end
 
@@ -269,10 +282,32 @@ group :production do
   gem "gitlab_meta", '7.0'
 end
 
-gem "newrelic_rpm"
+gem "newrelic_rpm", '~> 3.9.4.245'
 
-gem 'octokit', '3.7.0'
+gem 'octokit', '~> 3.7.0'
 
 gem "mail_room", "~> 0.4.2"
 
-gem 'email_reply_parser'
+gem 'email_reply_parser', '~> 0.5.8'
+
+## CI
+gem 'activerecord-deprecated_finders', '~> 1.0.3'
+gem 'activerecord-session_store', '~> 0.1.0'
+gem "nested_form", '~> 0.3.2'
+
+# Scheduled
+gem 'whenever', '~> 0.8.4', require: false
+
+# OAuth
+gem 'oauth2', '~> 1.0.0'
+
+# Soft deletion
+gem "paranoia", "~> 2.0"
+
+group :development, :test do
+  gem 'guard-rspec', '~> 4.2.0'
+
+  gem 'rb-fsevent', require: darwin_only('rb-fsevent')
+  gem 'growl',      require: darwin_only('growl')
+  gem 'rb-inotify', require: linux_only('rb-inotify')
+end

Procfile

 web: bundle exec unicorn_rails -p ${PORT:="3000"} -E ${RAILS_ENV:="development"} -c ${UNICORN_CONFIG:="config/unicorn.rb"}
-worker: bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q common -q default
+worker: bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q runner -q common -q default
 # mail_room: bundle exec mail_room -q -c config/mail_room.yml

README.md

@@ -3,7 +3,7 @@
 [![build status](https://ci.gitlab.com/projects/1/status.png?ref=master)](https://ci.gitlab.com/projects/1?ref=master)
 [![Build Status](https://semaphoreci.com/api/v1/projects/2f1a5809-418b-4cc2-a1f4-819607579fe7/400484/shields_badge.svg)](https://semaphoreci.com/gitlabhq/gitlabhq)
 [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
-[![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)
+[![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.svg?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)
 
 ## Canonical source
 

app/assets/javascripts/blob/blob_file_dropzone.js.coffee

+class @BlobFileDropzone
+  constructor: (form, method) ->
+    form_dropzone = form.find('.dropzone')
+    Dropzone.autoDiscover = false
+    dropzone = form_dropzone.dropzone(
+      autoDiscover: false
+      autoProcessQueue: false
+      url: form.attr('action')
+      # Rails uses a hidden input field for PUT
+      # http://stackoverflow.com/questions/21056482/how-to-set-method-put-in-form-tag-in-rails
+      method: method
+      clickable: true
+      uploadMultiple: false
+      paramName: "file"
+      maxFilesize: gon.max_file_size or 10
+      parallelUploads: 1
+      maxFiles: 1
+      addRemoveLinks: true
+      previewsContainer: '.dropzone-previews'
+      headers:
+        "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
+
+      init: ->
+        this.on 'addedfile', (file) ->
+          $('.dropzone-alerts').html('').hide()
+          commit_message = form.find('#commit_message')[0]
+
+          if /^Upload/.test(commit_message.placeholder)
+            commit_message.placeholder = 'Upload ' + file.name
+
+          return
+
+        this.on 'removedfile', (file) ->
+          commit_message = form.find('#commit_message')[0]
+
+          if /^Upload/.test(commit_message.placeholder)
+            commit_message.placeholder = 'Upload new file'
+
+          return
+
+        this.on 'success', (header, response) ->
+          window.location.href = response.filePath
+          return
+
+        this.on 'maxfilesexceeded', (file) ->
+          @removeFile file
+          return
+
+        this.on 'sending', (file, xhr, formData) ->
+          formData.append('commit_message', form.find('#commit_message').val())
+          return
+
+      # Override behavior of adding error underneath preview
+      error: (file, errorMessage) ->
+        stripped = $("<div/>").html(errorMessage).text();
+        $('.dropzone-alerts').html('Error uploading file: \"' + stripped + '\"').show()
+        @removeFile file
+        return
+    )
+
+    submitButton = form.find('#submit-all')[0]
+    submitButton.addEventListener 'click', (e) ->
+      e.preventDefault()
+      e.stopPropagation()
+      alert "Please select a file" if dropzone[0].dropzone.getQueuedFiles().length == 0
+      dropzone[0].dropzone.processQueue()
+      return false

app/assets/javascripts/ci/application.js.coffee

+# This is a manifest file that'll be compiled into application.js, which will include all the files
+# listed below.
+#
+# Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+# or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+#
+# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+# the compiled file.
+#
+# WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+# GO AFTER THE REQUIRES BELOW.
+#
+#= require pager
+#= require jquery_nested_form
+#= require_tree .
+#
+$(document).on 'click', '.edit-runner-link', (event) ->
+  event.preventDefault()
+
+  descr = $(this).closest('.runner-description').first()
+  descr.addClass('hide')
+  form = descr.next('.runner-description-form')
+  descrInput = form.find('input.description')
+  originalValue = descrInput.val()
+  form.removeClass('hide')
+  form.find('.cancel').on 'click', (event) ->
+    event.preventDefault()
+
+    form.addClass('hide')
+    descrInput.val(originalValue)
+    descr.removeClass('hide')
+
+$(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/build.coffee

+class CiBuild
+  @interval: null
+
+  constructor: (build_url, build_status) ->
+    clearInterval(CiBuild.interval)
+
+    if build_status == "running" || build_status == "pending"
+      #
+      # Bind autoscroll button to follow build output
+      #
+      $("#autoscroll-button").bind "click", ->
+        state = $(this).data("state")
+        if "enabled" is state
+          $(this).data "state", "disabled"
+          $(this).text "enable autoscroll"
+        else
+          $(this).data "state", "enabled"
+          $(this).text "disable autoscroll"
+
+      #
+      # Check for new build output if user still watching build page
+      # Only valid for runnig build when output changes during time
+      #
+      CiBuild.interval = setInterval =>
+        if window.location.href is build_url
+          $.ajax
+            url: build_url
+            dataType: "json"
+            success: (build) =>
+              if build.status == "running"
+                $('#build-trace code').html build.trace_html
+                $('#build-trace code').append '<i class="fa fa-refresh fa-spin"/>'
+                @checkAutoscroll()
+              else
+                Turbolinks.visit build_url
+      , 4000
+
+  checkAutoscroll: ->
+    $("html,body").scrollTop $("#build-trace").height()  if "enabled" is $("#autoscroll-button").data("state")
+
+@CiBuild = CiBuild

app/assets/javascripts/ci/pager.js.coffee

+@CiPager =
+  init: (@url, @limit = 0, preload, @disable = false) ->
+    if preload
+      @offset = 0
+      @getItems()
+    else
+      @offset = @limit
+    @initLoadMore()
+
+  getItems: ->
+    $(".loading").show()
+    $.ajax
+      type: "GET"
+      url: @url
+      data: "limit=" + @limit + "&offset=" + @offset
+      complete: =>
+        $(".loading").hide()
+      success: (data) =>
+        CiPager.append(data.count, data.html)
+      dataType: "json"
+
+  append: (count, html) ->
+    if count > 1
+      $(".content-list").append html
+    if count == @limit
+      @offset += count
+    else
+      @disable = true
+
+  initLoadMore: ->
+    $(document).unbind('scroll')
+    $(document).endlessScroll
+      bottomPixels: 400
+      fireDelay: 1000
+      fireOnce: true
+      ceaseFire: ->
+        CiPager.disable
+
+      callback: (i) =>
+        unless $(".loading").is(':visible')
+          $(".loading").show()
+          CiPager.getItems()

app/assets/javascripts/ci/projects.js.coffee

+$(document).on 'click', '.badge-codes-toggle', ->
+  $('.badge-codes-block').toggleClass("hide")
+  return false
+
+$(document).on 'click', '.sync-now', ->
+  $(this).find('i').addClass('fa-spin')

app/assets/stylesheets/application.scss

@@ -61,3 +61,9 @@
  * Styles for JS behaviors.
  */
 @import "behaviors.scss";
+
+/**
+ * CI specific styles:
+ */
+@import "ci/**/*";
+

app/assets/stylesheets/ci/builds.scss

+.ci-body {
+  pre.trace {
+    background: #111111;
+    color: #fff;
+    font-family: $monospace_font;
+    white-space: pre;
+    white-space: pre-wrap;       /* css-3 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: -pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
+    overflow: auto;
+    overflow-y: hidden;
+    font-size: 12px;
+
+    .fa-refresh {
+      font-size: 24px;
+      margin-left: 20px;
+    }
+  }
+
+  .autoscroll-container {
+    position: fixed;
+    bottom: 10px;
+    right: 20px;
+    z-index: 100;
+  }
+
+  .scroll-controls {
+    position: fixed;
+    bottom: 10px;
+    left: 250px;
+    z-index: 100;
+
+    a {
+      display: block;
+      margin-bottom: 5px;
+    }
+  }
+
+  .page-sidebar-collapsed {
+    .scroll-controls {
+      left: 70px;
+    }
+  }
+
+  .build-widget {
+    padding: 10px;
+    background: $background-color;
+    margin-bottom: 20px;
+    border-radius: 4px;
+
+    .title {
+      margin-top: 0;
+      color: #666;
+      line-height: 1.5;
+    }
+    .attr-name {
+      color: #777;
+    }
+  }
+
+  .alert-disabled {
+    background: $background-color;
+
+    a {
+      color: #3084bb !important;
+    }
+  }
+}

app/assets/stylesheets/ci/lint.scss

+.ci-body {
+  .incorrect-syntax{
+    font-size: 19px;
+    color: red;
+  }
+  .correct-syntax{
+    font-size: 19px;
+    color: #47a447;
+  }
+}

app/assets/stylesheets/ci/projects.scss

+.ci-body {
+  .project-title {
+    margin: 0;
+    color: #444;
+    font-size: 20px;
+    line-height: 1.5;
+  }
+
+  .wide-table-holder {
+    margin-left: -$gl-padding;
+    margin-right: -$gl-padding;
+  }
+
+  .builds,
+  .projects-table {
+    .alert-success {
+      background-color: #6fc995;
+      border-color: #5bba83;
+    }
+
+    .alert-danger {
+      background-color: #eb897f;
+      border-color: #d4776e;
+    }
+
+    .alert-info {
+      background-color: #3498db;
+      border-color: #2e8ece;
+    }
+
+    .alert-warning {
+      background-color: #EB974E;
+      border-color: #E87E04;
+    }
+
+    .alert-disabled {
+      background: $background-color;
+      border-color: $border-color;
+    }
+
+    .light {
+      border-color: $border-color;
+    }
+
+    th, td {
+      padding: 10px $gl-padding;
+    }
+
+    td {
+      vertical-align: middle !important;
+      border-color: inherit !important;
+
+      a {
+        font-weight: normal;
+        text-decoration: none;
+      }
+    }
+  }
+
+  .commit-info {
+    font-size: 14px;
+
+    .attr-name {
+      font-weight: 300;
+      color: #666;
+      margin-right: 5px;
+    }
+
+    pre.commit-message {
+      font-size: 14px;
+      background: none;
+      padding: 0;
+      margin: 0;
+      border: none;
+      margin: 20px 0;
+      border-bottom: 1px solid #EEE;
+      padding-bottom: 20px;
+      border-radius: 0;
+    }
+  }
+
+  .loading{
+    font-size: 20px;
+  }
+
+  .ci-charts {
+    fieldset {
+      margin-bottom: 16px;
+    }
+  }
+}

app/assets/stylesheets/ci/runners.scss

+.ci-body {
+  .runner-state {
+    padding: 6px 12px;
+    margin-right: 10px;
+    color: #FFF;
+
+    &.runner-state-shared {
+      background: #32b186;
+    }
+    &.runner-state-specific {
+      background: #3498db;
+    }
+  }
+
+  .runner-status-online {
+    color: green;
+  }
+
+  .runner-status-offline {
+    color: gray;
+  }
+
+  .runner-status-paused {
+    color: red;
+  }
+
+  .runner {
+    .btn {
+      padding: 1px 6px;
+    }
+
+    h4 {
+      font-weight: normal;
+    }
+  }
+}

app/assets/stylesheets/generic/blocks.scss

@@ -36,6 +36,11 @@
     margin-bottom: 0;
   }
 
+  &.clear-block {
+    margin-bottom: $gl-padding - 1px;
+    padding-bottom: $gl-padding;
+  }
+
   &.second-block {
     margin-top: -1px;
     margin-bottom: 0;

app/assets/stylesheets/generic/common.scss

@@ -377,4 +377,16 @@ table {
   height: 56px;
   margin-top: -$gl-padding;
   padding-top: $gl-padding;
+
+  &.no-bottom {
+    margin-bottom: 0;
+  }
+}
+
+.dropzone .dz-preview .dz-progress {
+  border-color: $border-color !important;
+}
+
+.dropzone .dz-preview .dz-progress .dz-upload {
+  background: $gl-success !important;
 }

app/assets/stylesheets/pages/editor.scss

@@ -9,6 +9,10 @@
     width: 100%;
   }
 
+  .ace_gutter-cell {
+    background-color: $background-color;
+  }
+
   .cancel-btn {
     color: #B94A48;
     &:hover {
@@ -32,14 +36,12 @@
 
   .file-title {
     @extend .monospace;
-    font-size: 14px;
-    padding: 5px;
   }
 
   .editor-ref {
     background: $background-color;
     padding: 11px 15px;
-    border-right: 1px solid #CCC;
+    border-right: 1px solid $border-color;
     display: inline-block;
     margin: -5px -5px;
     margin-right: 10px;
@@ -50,5 +52,15 @@
       display: inline-block;
       width: 200px;
     }
+
+    .form-control {
+      margin-top: -3px;
+    }
+  }
+
+  .form-actions {
+    margin: -$gl-padding;
+    margin-top: 0;
+    padding: $gl-padding
   }
 }

app/assets/stylesheets/pages/tree.scss

@@ -116,3 +116,16 @@
 }
 
 #modal-remove-blob > .modal-dialog { width: 850px; }
+
+.blob-upload-dropzone-previews {
+  text-align: center;
+  border: 2px;
+  border-style: dashed;
+  border-color: $border-color;
+  min-height: 200px;
+}
+
+.upload-link {
+  font-weight: normal;
+  color: $md-link-color;
+}

app/controllers/application_controller.rb

@@ -134,9 +134,6 @@ class ApplicationController < ActionController::Base
 
   def repository
     @repository ||= project.repository
-  rescue Grit::NoSuchPathError => e
-    log_exception(e)
-    nil
   end
 
   def authorize_project!(action)

app/controllers/autocomplete_controller.rb

@@ -32,6 +32,7 @@ class AutocompleteController < ApplicationController
     @users ||= User.none
     @users = @users.search(params[:search]) if params[:search].present?
     @users = @users.active
+    @users = @users.reorder(:name)
     @users = @users.page(params[:page]).per(PER_PAGE)
 
     unless params[:search].present?

app/controllers/ci/admin/application_controller.rb

+module Ci
+  module Admin
+    class ApplicationController < Ci::ApplicationController
+      before_action :authenticate_user!
+      before_action :authenticate_admin!
+
+      layout "ci/admin"
+    end
+  end
+end

app/controllers/ci/admin/application_settings_controller.rb

+module Ci
+  class Admin::ApplicationSettingsController < Ci::Admin::ApplicationController
+    before_action :set_application_setting
+
+    def show
+    end
+
+    def update
+      if @application_setting.update_attributes(application_setting_params)
+        redirect_to ci_admin_application_settings_path,
+          notice: 'Application settings saved successfully'
+      else
+        render :show
+      end
+    end
+
+    private
+
+    def set_application_setting
+      @application_setting = Ci::ApplicationSetting.current
+      @application_setting ||= Ci::ApplicationSetting.create_from_defaults
+    end
+
+    def application_setting_params
+      params.require(:application_setting).permit(
+        :all_broken_builds,
+        :add_pusher,
+      )
+    end
+  end
+end

app/controllers/ci/admin/builds_controller.rb

+module Ci
+  class Admin::BuildsController < Ci::Admin::ApplicationController
+    def index
+      @scope = params[:scope]
+      @builds = Ci::Build.order('created_at DESC').page(params[:page]).per(30)
+
+      @builds =
+        case @scope
+        when "pending"
+          @builds.pending
+        when "running"
+          @builds.running
+        else
+          @builds
+        end
+    end
+  end
+end

app/controllers/ci/admin/events_controller.rb

+module Ci
+  class Admin::EventsController < Ci::Admin::ApplicationController
+    EVENTS_PER_PAGE = 50
+
+    def index
+      @events = Ci::Event.admin.order('created_at DESC').page(params[:page]).per(EVENTS_PER_PAGE)
+    end
+  end
+end

app/controllers/ci/admin/projects_controller.rb

+module Ci
+  class Admin::ProjectsController < Ci::Admin::ApplicationController
+    def index
+      @projects = Ci::Project.ordered_by_last_commit_date.page(params[:page]).per(30)
+    end
+
+    def destroy
+      project.destroy
+
+      redirect_to ci_projects_url
+    end
+
+    protected
+
+    def project
+      @project ||= Ci::Project.find(params[:id])
+    end
+  end
+end

app/controllers/ci/admin/runner_projects_controller.rb

+module Ci
+  class Admin::RunnerProjectsController < Ci::Admin::ApplicationController
+    layout 'ci/project'
+
+    def index
+      @runner_projects = project.runner_projects.all
+      @runner_project = project.runner_projects.new
+    end
+
+    def create
+      @runner = Ci::Runner.find(params[:runner_project][:runner_id])
+
+      if @runner.assign_to(project, current_user)
+        redirect_to ci_admin_runner_path(@runner)
+      else
+        redirect_to ci_admin_runner_path(@runner), alert: 'Failed adding runner to project'
+      end
+    end
+
+    def destroy
+      rp = Ci::RunnerProject.find(params[:id])
+      runner = rp.runner
+      rp.destroy
+
+      redirect_to ci_admin_runner_path(runner)
+    end
+
+    private
+
+    def project
+      @project ||= Ci::Project.find(params[:project_id])
+    end
+  end
+end

app/controllers/ci/admin/runners_controller.rb

+module Ci
+  class Admin::RunnersController < Ci::Admin::ApplicationController
+    before_action :runner, except: :index
+
+    def index
+      @runners = Ci::Runner.order('id DESC')
+      @runners = @runners.search(params[:search]) if params[:search].present?
+      @runners = @runners.page(params[:page]).per(30)
+      @active_runners_cnt = Ci::Runner.where("contacted_at > ?", 1.minutes.ago).count
+    end
+
+    def show
+      @builds = @runner.builds.order('id DESC').first(30)
+      @projects = Ci::Project.all
+      @projects = @projects.search(params[:search]) if params[:search].present?
+      @projects = @projects.where("ci_projects.id NOT IN (?)", @runner.projects.pluck(:id)) if @runner.projects.any?
+      @projects = @projects.page(params[:page]).per(30)
+    end
+
+    def update
+      @runner.update_attributes(runner_params)
+
+      respond_to do |format|
+        format.js
+        format.html { redirect_to ci_admin_runner_path(@runner) }
+      end
+    end
+
+    def destroy
+      @runner.destroy
+
+      redirect_to ci_admin_runners_path
+    end
+
+    def resume
+      if @runner.update_attributes(active: true)
+        redirect_to ci_admin_runners_path, notice: 'Runner was successfully updated.'
+      else
+        redirect_to ci_admin_runners_path, alert: 'Runner was not updated.'
+      end
+    end
+
+    def pause
+      if @runner.update_attributes(active: false)
+        redirect_to ci_admin_runners_path, notice: 'Runner was successfully updated.'
+      else
+        redirect_to ci_admin_runners_path, alert: 'Runner was not updated.'
+      end
+    end
+
+    def assign_all
+      Ci::Project.unassigned(@runner).all.each do |project|
+        @runner.assign_to(project, current_user)
+      end
+
+      redirect_to ci_admin_runner_path(@runner), notice: "Runner was assigned to all projects"
+    end
+
+    private
+
+    def runner
+      @runner ||= Ci::Runner.find(params[:id])
+    end
+
+    def runner_params
+      params.require(:runner).permit(:token, :description, :tag_list, :contacted_at, :active)
+    end
+  end
+end

app/controllers/ci/application_controller.rb

+module Ci
+  class ApplicationController < ::ApplicationController
+    def self.railtie_helpers_paths
+      "app/helpers/ci"
+    end
+
+    helper_method :gl_project
+
+    private
+
+    def authenticate_public_page!
+      unless project.public
+        unless current_user
+          redirect_to(new_user_sessions_path) and return
+        end
+
+        return access_denied! unless can?(current_user, :read_project, gl_project)
+      end
+    end
+
+    def authenticate_token!
+      unless project.valid_token?(params[:token])
+        return head(403)
+      end
+    end
+
+    def authorize_access_project!
+      unless can?(current_user, :read_project, gl_project)
+        return page_404
+      end
+    end
+
+    def authorize_manage_builds!
+      unless can?(current_user, :admin_project, gl_project)
+        return page_404
+      end
+    end
+
+    def authenticate_admin!
+      return render_404 unless current_user.is_admin?
+    end
+
+    def authorize_manage_project!
+      unless can?(current_user, :admin_project, gl_project)
+        return page_404
+      end
+    end
+
+    def page_404
+      render file: "#{Rails.root}/public/404.html", status: 404, layout: false
+    end
+
+    def default_headers
+      headers['X-Frame-Options'] = 'DENY'
+      headers['X-XSS-Protection'] = '1; mode=block'
+    end
+
+    # JSON for infinite scroll via Pager object
+    def pager_json(partial, count)
+      html = render_to_string(
+        partial,
+        layout: false,
+        formats: [:html]
+      )
+
+      render json: {
+        html: html,
+        count: count
+      }
+    end
+
+    def gl_project
+      ::Project.find(@project.gitlab_id)
+    end
+  end
+end

app/controllers/ci/builds_controller.rb

+module Ci
+  class BuildsController < Ci::ApplicationController
+    before_action :authenticate_user!, except: [:status, :show]
+    before_action :authenticate_public_page!, only: :show
+    before_action :project
+    before_action :authorize_access_project!, except: [:status, :show]
+    before_action :authorize_manage_project!, except: [:status, :show, :retry, :cancel]
+    before_action :authorize_manage_builds!, only: [:retry, :cancel]
+    before_action :build, except: [:show]
+    layout 'ci/build'
+
+    def show
+      if params[:id] =~ /\A\d+\Z/
+        @build = build
+      else
+        # try to find commit by sha
+        commit = commit_by_sha
+
+        if commit
+          # Redirect to commit page
+          redirect_to ci_project_ref_commit_path(@project, @build.commit.ref, @build.commit.sha)
+          return
+        end
+      end
+
+      raise ActiveRecord::RecordNotFound unless @build
+
+      @builds = @project.commits.find_by_sha(@build.sha).builds.order('id DESC')
+      @builds = @builds.where("id not in (?)", @build.id).page(params[:page]).per(20)
+      @commit = @build.commit
+
+      respond_to do |format|
+        format.html
+        format.json do
+          render json: @build.to_json(methods: :trace_html)
+        end
+      end
+    end
+
+    def retry
+      if @build.commands.blank?
+        return page_404
+      end
+
+      build = Ci::Build.retry(@build)
+
+      if params[:return_to]
+        redirect_to URI.parse(params[:return_to]).path
+      else
+        redirect_to ci_project_build_path(project, build)
+      end
+    end
+
+    def status
+      render json: @build.to_json(only: [:status, :id, :sha, :coverage], methods: :sha)
+    end
+
+    def cancel
+      @build.cancel
+
+      redirect_to ci_project_build_path(@project, @build)
+    end
+
+    protected
+
+    def project
+      @project = Ci::Project.find(params[:project_id])
+    end
+
+    def build
+      @build ||= project.builds.unscoped.find_by(id: params[:id])
+    end
+
+    def commit_by_sha
+      @project.commits.find_by(sha: params[:id])
+    end
+  end
+end

app/controllers/ci/charts_controller.rb

+module Ci
+  class ChartsController < Ci::ApplicationController
+    before_action :authenticate_user!
+    before_action :project
+    before_action :authorize_access_project!
+    before_action :authorize_manage_project!
+
+    layout 'ci/project'
+
+    def show
+      @charts = {}
+      @charts[:week] = Ci::Charts::WeekChart.new(@project)
+      @charts[:month] = Ci::Charts::MonthChart.new(@project)
+      @charts[:year] = Ci::Charts::YearChart.new(@project)
+      @charts[:build_times] = Ci::Charts::BuildTime.new(@project)
+    end
+
+    protected
+
+    def project
+      @project = Ci::Project.find(params[:project_id])
+    end
+  end
+end

app/controllers/ci/commits_controller.rb

+module Ci
+  class CommitsController < Ci::ApplicationController
+    before_action :authenticate_user!, except: [:status, :show]
+    before_action :authenticate_public_page!, only: :show
+    before_action :project
+    before_action :authorize_access_project!, except: [:status, :show, :cancel]
+    before_action :authorize_manage_builds!, only: [:cancel]
+    before_action :commit, only: :show
+    layout 'ci/commit'
+
+    def show
+      @builds = @commit.builds
+    end
+
+    def status
+      commit = Ci::Project.find(params[:project_id]).commits.find_by_sha_and_ref!(params[:id], params[:ref_id])
+      render json: commit.to_json(only: [:id, :sha], methods: [:status, :coverage])
+    rescue ActiveRecord::RecordNotFound
+      render json: { status: "not_found" }
+    end
+
+    def cancel
+      commit.builds.running_or_pending.each(&:cancel)
+
+      redirect_to ci_project_ref_commits_path(project, commit.ref, commit.sha)
+    end
+
+    private
+
+    def project
+      @project ||= Ci::Project.find(params[:project_id])
+    end
+
+    def commit
+      @commit ||= Ci::Project.find(params[:project_id]).commits.find_by_sha_and_ref!(params[:id], params[:ref_id])
+    end
+  end
+end

app/controllers/ci/events_controller.rb

+module Ci
+  class EventsController < Ci::ApplicationController
+    EVENTS_PER_PAGE = 50
+
+    before_action :authenticate_user!
+    before_action :project
+    before_action :authorize_manage_project!
+
+    layout 'ci/project'
+
+    def index
+      @events = project.events.order("created_at DESC").page(params[:page]).per(EVENTS_PER_PAGE)
+    end
+
+    private
+
+    def project
+      @project ||= Ci::Project.find(params[:project_id])
+    end
+  end
+end

app/controllers/ci/helps_controller.rb

+module Ci
+  class HelpsController < Ci::ApplicationController
+    skip_filter :check_config
+
+    def show
+    end
+
+    def oauth2
+      if valid_config?
+        redirect_to ci_root_path
+      else
+        render layout: 'ci/empty'
+      end
+    end
+  end
+end

app/controllers/ci/lints_controller.rb

+module Ci
+  class LintsController < Ci::ApplicationController
+    before_action :authenticate_user!
+
+    def show
+    end
+
+    def create
+      if params[:content].blank?
+        @status = false
+        @error = "Please provide content of .gitlab-ci.yml"
+      else
+        @config_processor = Ci::GitlabCiYamlProcessor.new params[:content]
+        @stages = @config_processor.stages
+        @builds = @config_processor.builds
+        @status = true
+      end
+    rescue Ci::GitlabCiYamlProcessor::ValidationError => e
+      @error = e.message
+      @status = false
+    rescue Exception => e
+      @error = "Undefined error"
+      @status = false
+    end
+  end
+end

app/controllers/ci/projects_controller.rb

+module Ci
+  class ProjectsController < Ci::ApplicationController
+    PROJECTS_BATCH = 100
+
+    before_action :authenticate_user!, except: [:build, :badge, :index, :show]
+    before_action :authenticate_public_page!, only: :show
+    before_action :project, only: [:build, :integration, :show, :badge, :edit, :update, :destroy, :toggle_shared_runners, :dumped_yaml]
+    before_action :authorize_access_project!, except: [:build, :gitlab, :badge, :index, :show, :new, :create]
+    before_action :authorize_manage_project!, only: [:edit, :integration, :update, :destroy, :toggle_shared_runners, :dumped_yaml]
+    before_action :authenticate_token!, only: [:build]
+    before_action :no_cache, only: [:badge]
+    protect_from_forgery except: :build
+
+    layout 'ci/project', except: [:index, :gitlab]
+
+    def index
+      @projects = Ci::Project.ordered_by_last_commit_date.public_only.page(params[:page]) unless current_user
+    end
+
+    def gitlab
+      @limit, @offset = (params[:limit] || PROJECTS_BATCH).to_i, (params[:offset] || 0).to_i
+      @page = @offset == 0 ? 1 : (@offset / @limit + 1)
+
+      @gl_projects = current_user.authorized_projects
+      @gl_projects = @gl_projects.where("name LIKE ?", "%#{params[:search]}%") if params[:search]
+      @gl_projects = @gl_projects.page(@page).per(@limit)
+
+      @projects = Ci::Project.where(gitlab_id: @gl_projects.map(&:id)).ordered_by_last_commit_date
+      @total_count = @gl_projects.size
+
+      @gl_projects = @gl_projects.where.not(id: @projects.map(&:gitlab_id))
+
+      respond_to do |format|
+        format.json do
+          pager_json("ci/projects/gitlab", @total_count)
+        end
+      end
+    rescue
+      @error = 'Failed to fetch GitLab projects'
+    end
+
+    def show
+      @ref = params[:ref]
+
+      @commits = @project.commits.reverse_order
+      @commits = @commits.where(ref: @ref) if @ref
+      @commits = @commits.page(params[:page]).per(20)
+    end
+
+    def integration
+    end
+
+    def create
+      project_data = OpenStruct.new(JSON.parse(params["project"]))
+
+      unless can?(current_user, :admin_project, ::Project.find(project_data.id))
+        return redirect_to ci_root_path, alert: 'You have to have at least master role to enable CI for this project'
+      end
+
+      @project = Ci::CreateProjectService.new.execute(current_user, project_data, ci_project_url(":project_id"))
+
+      if @project.persisted?
+        redirect_to ci_project_path(@project, show_guide: true), notice: 'Project was successfully created.'
+      else
+        redirect_to :back, alert: 'Cannot save project'
+      end
+    end
+
+    def edit
+    end
+
+    def update
+      if project.update_attributes(project_params)
+        Ci::EventService.new.change_project_settings(current_user, project)
+
+        redirect_to :back, notice: 'Project was successfully updated.'
+      else
+        render action: "edit"
+      end
+    end
+
+    def destroy
+      project.gl_project.gitlab_ci_service.update_attributes(active: false)
+      project.destroy
+
+      Ci::EventService.new.remove_project(current_user, project)
+
+      redirect_to ci_projects_url
+    end
+
+    def build
+      @commit = Ci::CreateCommitService.new.execute(@project, params.dup)
+
+      if @commit && @commit.valid?
+        head 201
+      else
+        head 400
+      end
+    end
+
+    # Project status badge
+    # Image with build status for sha or ref
+    def badge
+      image = Ci::ImageForBuildService.new.execute(@project, params)
+
+      send_file image.path, filename: image.name, disposition: 'inline', type:"image/svg+xml"
+    end
+
+    def toggle_shared_runners
+      project.toggle!(:shared_runners_enabled)
+      redirect_to :back
+    end
+
+    def dumped_yaml
+      send_data @project.generated_yaml_config, filename: '.gitlab-ci.yml'
+    end
+
+    protected
+
+    def project
+      @project ||= Ci::Project.find(params[:id])
+    end
+
+    def no_cache
+      response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
+      response.headers["Pragma"] = "no-cache"
+      response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
+    end
+
+    def project_params
+      params.require(:project).permit(:path, :timeout, :timeout_in_minutes, :default_ref, :always_build,
+        :polling_interval, :public, :ssh_url_to_repo, :allow_git_fetch, :email_recipients,
+        :email_add_pusher, :email_only_broken_builds, :coverage_regex, :shared_runners_enabled, :token,
+        { variables_attributes: [:id, :key, :value, :_destroy] })
+    end
+  end
+end

app/controllers/ci/runner_projects_controller.rb

+module Ci
+  class RunnerProjectsController < Ci::ApplicationController
+    before_action :authenticate_user!
+    before_action :project
+    before_action :authorize_manage_project!
+
+    layout 'ci/project'
+
+    def create
+      @runner = Ci::Runner.find(params[:runner_project][:runner_id])
+
+      return head(403) unless current_user.ci_authorized_runners.include?(@runner)
+
+      if @runner.assign_to(project, current_user)
+        redirect_to ci_project_runners_path(project)
+      else
+        redirect_to ci_project_runners_path(project), alert: 'Failed adding runner to project'
+      end
+    end
+
+    def destroy
+      runner_project = project.runner_projects.find(params[:id])
+      runner_project.destroy
+
+      redirect_to ci_project_runners_path(project)
+    end
+
+    private
+
+    def project
+      @project ||= Ci::Project.find(params[:project_id])
+    end
+  end
+end

app/controllers/ci/runners_controller.rb

+module Ci
+  class RunnersController < Ci::ApplicationController
+    before_action :authenticate_user!
+    before_action :project
+    before_action :set_runner, only: [:edit, :update, :destroy, :pause, :resume, :show]
+    before_action :authorize_access_project!
+    before_action :authorize_manage_project!
+
+    layout 'ci/project'
+
+    def index
+      @runners = @project.runners.order('id DESC')
+      @specific_runners =
+        Ci::Runner.specific.includes(:runner_projects).
+        where(Ci::RunnerProject.table_name => { project_id: current_user.authorized_projects } ).
+        where.not(id:  @runners).order("#{Ci::Runner.table_name}.id DESC").page(params[:page]).per(20)
+      @shared_runners = Ci::Runner.shared.active
+      @shared_runners_count = @shared_runners.count(:all)
+    end
+
+    def edit
+    end
+
+    def update
+      if @runner.update_attributes(runner_params)
+        redirect_to edit_ci_project_runner_path(@project, @runner), notice: 'Runner was successfully updated.'
+      else
+        redirect_to edit_ci_project_runner_path(@project, @runner), alert: 'Runner was not updated.'
+      end
+    end
+
+    def destroy
+      if @runner.only_for?(@project)
+        @runner.destroy
+      end
+
+      redirect_to ci_project_runners_path(@project)
+    end
+
+    def resume
+      if @runner.update_attributes(active: true)
+        redirect_to ci_project_runners_path(@project, @runner), notice: 'Runner was successfully updated.'
+      else
+        redirect_to ci_project_runners_path(@project, @runner), alert: 'Runner was not updated.'
+      end
+    end
+
+    def pause
+      if @runner.update_attributes(active: false)
+        redirect_to ci_project_runners_path(@project, @runner), notice: 'Runner was successfully updated.'
+      else
+        redirect_to ci_project_runners_path(@project, @runner), alert: 'Runner was not updated.'
+      end
+    end
+
+    def show
+    end
+
+    protected
+
+    def project
+      @project = Ci::Project.find(params[:project_id])
+    end
+
+    def set_runner
+      @runner ||= @project.runners.find(params[:id])
+    end
+
+    def runner_params
+      params.require(:runner).permit(:description, :tag_list, :contacted_at, :active)
+    end
+  end
+end

app/controllers/ci/services_controller.rb

+module Ci
+  class ServicesController < Ci::ApplicationController
+    before_action :authenticate_user!
+    before_action :project
+    before_action :authorize_access_project!
+    before_action :authorize_manage_project!
+    before_action :service, only: [:edit, :update, :test]
+
+    respond_to :html
+
+    layout 'ci/project'
+
+    def index
+      @project.build_missing_services
+      @services = @project.services.reload
+    end
+
+    def edit
+    end
+
+    def update
+      if @service.update_attributes(service_params)
+        redirect_to edit_ci_project_service_path(@project, @service.to_param)
+      else
+        render 'edit'
+      end
+    end
+
+    def test
+      last_build = @project.builds.last
+
+      if @service.execute(last_build)
+        message = { notice: 'We successfully tested the service' }
+      else
+        message = { alert: 'We tried to test the service but error occurred' }
+      end
+
+      redirect_to :back, message
+    end
+
+    private
+
+    def project
+      @project = Ci::Project.find(params[:project_id])
+    end
+
+    def service
+      @service ||= @project.services.find { |service| service.to_param == params[:id] }
+    end
+
+    def service_params
+      params.require(:service).permit(
+        :type, :active, :webhook, :notify_only_broken_builds,
+        :email_recipients, :email_only_broken_builds, :email_add_pusher,
+        :hipchat_token, :hipchat_room, :hipchat_server
+      )
+    end
+  end
+end

app/controllers/ci/triggers_controller.rb

+module Ci
+  class TriggersController < Ci::ApplicationController
+    before_action :authenticate_user!
+    before_action :project
+    before_action :authorize_access_project!
+    before_action :authorize_manage_project!
+
+    layout 'ci/project'
+
+    def index
+      @triggers = @project.triggers
+      @trigger = Ci::Trigger.new
+    end
+
+    def create
+      @trigger = @project.triggers.new
+      @trigger.save
+
+      if @trigger.valid?
+        redirect_to ci_project_triggers_path(@project)
+      else
+        @triggers = @project.triggers.select(&:persisted?)
+        render :index
+      end
+    end
+
+    def destroy
+      trigger.destroy
+
+      redirect_to ci_project_triggers_path(@project)
+    end
+
+    private
+
+    def trigger
+      @trigger ||= @project.triggers.find(params[:id])
+    end
+
+    def project
+      @project = Ci::Project.find(params[:project_id])
+    end
+  end
+end

app/controllers/ci/variables_controller.rb

+module Ci
+  class VariablesController < Ci::ApplicationController
+    before_action :authenticate_user!
+    before_action :project
+    before_action :authorize_access_project!
+    before_action :authorize_manage_project!
+
+    layout 'ci/project'
+
+    def show
+    end
+
+    def update
+      if project.update_attributes(project_params)
+        Ci::EventService.new.change_project_settings(current_user, project)
+
+        redirect_to ci_project_variables_path(project), notice: 'Variables were successfully updated.'
+      else
+        render action: 'show'
+      end
+    end
+
+    private
+
+    def project
+      @project ||= Ci::Project.find(params[:project_id])
+    end
+
+    def project_params
+      params.require(:project).permit({ variables_attributes: [:id, :key, :value, :_destroy] })
+    end
+  end
+end

app/controllers/ci/web_hooks_controller.rb

+module Ci
+  class WebHooksController < Ci::ApplicationController
+    before_action :authenticate_user!
+    before_action :project
+    before_action :authorize_access_project!
+    before_action :authorize_manage_project!
+
+    layout 'ci/project'
+
+    def index
+      @web_hooks = @project.web_hooks
+      @web_hook = Ci::WebHook.new
+    end
+
+    def create
+      @web_hook = @project.web_hooks.new(web_hook_params)
+      @web_hook.save
+
+      if @web_hook.valid?
+        redirect_to ci_project_web_hooks_path(@project)
+      else
+        @web_hooks = @project.web_hooks.select(&:persisted?)
+        render :index
+      end
+    end
+
+    def test
+      Ci::TestHookService.new.execute(hook, current_user)
+
+      redirect_to :back
+    end
+
+    def destroy
+      hook.destroy
+
+      redirect_to ci_project_web_hooks_path(@project)
+    end
+
+    private
+
+    def hook
+      @web_hook ||= @project.web_hooks.find(params[:id])
+    end
+
+    def project
+      @project = Ci::Project.find(params[:project_id])
+    end
+
+    def web_hook_params
+      params.require(:web_hook).permit(:url)
+    end
+  end
+end

app/controllers/import/fogbugz_controller.rb

@@ -2,7 +2,6 @@ class Import::FogbugzController < Import::BaseController
   before_action :verify_fogbugz_import_enabled
   before_action :user_map, only: [:new_user_map, :create_user_map]
 
-  # Doesn't work yet due to bug in ruby-fogbugz, see below
   rescue_from Fogbugz::AuthenticationException, with: :fogbugz_unauthorized
 
   def new
@@ -13,8 +12,8 @@ class Import::FogbugzController < Import::BaseController
     begin
       res = Gitlab::FogbugzImport::Client.new(import_params.symbolize_keys)
     rescue
-      # Needed until https://github.com/firmafon/ruby-fogbugz/pull/9 is merged
-      return redirect_to :back, alert: 'Could not authenticate with FogBugz, check your URL, email, and password'
+      # If the URI is invalid various errors can occur
+      return redirect_to new_import_fogbugz_path, alert: 'Could not connect to FogBugz, check your URL'
     end
     session[:fogbugz_token] = res.get_token
     session[:fogbugz_uri] = params[:uri]
@@ -92,8 +91,7 @@ class Import::FogbugzController < Import::BaseController
   end
 
   def fogbugz_unauthorized(exception)
-    flash[:alert] = exception.message
-    redirect_to new_import_fogbugz_path
+    redirect_to new_import_fogbugz_path, alert: exception.message
   end
 
   def import_params

app/controllers/projects/blob_controller.rb

@@ -18,6 +18,12 @@ class Projects::BlobController < Projects::ApplicationController
   before_action :after_edit_path, only: [:edit, :update]
 
   def new
+    @title = 'Upload'
+    @placeholder = 'Upload new file'
+    @button_title = 'Upload file'
+    @form_path = namespace_project_create_blob_path(@project.namespace, @project, @id)
+    @method = :post
+
     commit unless @repository.empty?
   end
 
@@ -26,14 +32,25 @@ class Projects::BlobController < Projects::ApplicationController
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
-      redirect_to namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path))
+      respond_to do |format|
+        format.html { redirect_to namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path)) }
+        format.json { render json: { message: "success", filePath: namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path)) } }
+      end
     else
       flash[:alert] = result[:message]
-      render :new
+      respond_to do |format|
+        format.html { render :new }
+        format.json { render json: { message: "failed", filePath: namespace_project_new_blob_path(@project.namespace, @project, @id) } }
+      end
     end
   end
 
   def show
+    @title = "Replace #{@blob.name}"
+    @placeholder = @title
+    @button_title = 'Replace file'
+    @form_path = namespace_project_update_blob_path(@project.namespace, @project, @id)
+    @method = :put
   end
 
   def edit
@@ -45,10 +62,16 @@ class Projects::BlobController < Projects::ApplicationController
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
-      redirect_to after_edit_path
+      respond_to do |format|
+        format.html { redirect_to after_edit_path }
+        format.json { render json: { message: "success", filePath: after_edit_path } }
+      end
     else
       flash[:alert] = result[:message]
-      render :edit
+      respond_to do |format|
+        format.html { render :edit }
+        format.json { render json: { message: "failed", filePath: namespace_project_new_blob_path(@project.namespace, @project, @id) } }
+      end
     end
   end
 
@@ -146,11 +169,19 @@ class Projects::BlobController < Projects::ApplicationController
 
     @file_path =
       if action_name.to_s == 'create'
+        if params[:file].present?
+          params[:file_name] = params[:file].original_filename
+        end
         File.join(@path, File.basename(params[:file_name]))
       else
         @path
       end
 
+    if params[:file].present?
+      params[:content] = Base64.encode64(params[:file].read)
+      params[:encoding] = 'base64'
+    end
+
     @commit_params = {
       file_path: @file_path,
       current_branch: @current_branch,

app/helpers/application_helper.rb

@@ -82,7 +82,7 @@ module ApplicationHelper
   end
 
   def default_avatar
-    image_path('no_avatar.png')
+    'no_avatar.png'
   end
 
   def last_commit(project)

app/helpers/auth_helper.rb

@@ -40,7 +40,7 @@ module AuthHelper
     if provider_has_icon?(provider)
       file_name = "#{provider.to_s.split('_').first}_#{size}.png"
 
-      image_tag(image_path("auth_buttons/#{file_name}"), alt: label, title: "Sign in with #{label}")
+      image_tag("auth_buttons/#{file_name}", alt: label, title: "Sign in with #{label}")
     else
       label
     end

app/helpers/ci/application_helper.rb

+module Ci
+  module ApplicationHelper
+    def loader_html
+      image_tag 'ci/loader.gif', alt: 'Loading'
+    end
+
+    # Navigation link helper
+    #
+    # Returns an `li` element with an 'active' class if the supplied
+    # controller(s) and/or action(s) are currently active. The content of the
+    # element is the value passed to the block.
+    #
+    # options - The options hash used to determine if the element is "active" (default: {})
+    #           :controller   - One or more controller names to check (optional).
+    #           :action       - One or more action names to check (optional).
+    #           :path         - A shorthand path, such as 'dashboard#index', to check (optional).
+    #           :html_options - Extra options to be passed to the list element (optional).
+    # block   - An optional block that will become the contents of the returned
+    #           `li` element.
+    #
+    # When both :controller and :action are specified, BOTH must match in order
+    # to be marked as active. When only one is given, either can match.
+    #
+    # Examples
+    #
+    #   # Assuming we're on TreeController#show
+    #
+    #   # Controller matches, but action doesn't
+    #   nav_link(controller: [:tree, :refs], action: :edit) { "Hello" }
+    #   # => '<li>Hello</li>'
+    #
+    #   # Controller matches
+    #   nav_link(controller: [:tree, :refs]) { "Hello" }
+    #   # => '<li class="active">Hello</li>'
+    #
+    #   # Shorthand path
+    #   nav_link(path: 'tree#show') { "Hello" }
+    #   # => '<li class="active">Hello</li>'
+    #
+    #   # Supplying custom options for the list element
+    #   nav_link(controller: :tree, html_options: {class: 'home'}) { "Hello" }
+    #   # => '<li class="home active">Hello</li>'
+    #
+    # Returns a list item element String
+    def nav_link(options = {}, &block)
+      if path = options.delete(:path)
+        if path.respond_to?(:each)
+          c = path.map { |p| p.split('#').first }
+          a = path.map { |p| p.split('#').last }
+        else
+          c, a, _ = path.split('#')
+        end
+      else
+        c = options.delete(:controller)
+        a = options.delete(:action)
+      end
+
+      if c && a
+        # When given both options, make sure BOTH are active
+        klass = current_controller?(*c) && current_action?(*a) ? 'active' : ''
+      else
+        # Otherwise check EITHER option
+        klass = current_controller?(*c) || current_action?(*a) ? 'active' : ''
+      end
+
+      # Add our custom class into the html_options, which may or may not exist
+      # and which may or may not already have a :class key
+      o = options.delete(:html_options) || {}
+      o[:class] ||= ''
+      o[:class] += ' ' + klass
+      o[:class].strip!
+
+      if block_given?
+        content_tag(:li, capture(&block), o)
+      else
+        content_tag(:li, nil, o)
+      end
+    end
+
+    # Check if a particular controller is the current one
+    #
+    # args - One or more controller names to check
+    #
+    # Examples
+    #
+    #   # On TreeController
+    #   current_controller?(:tree)           # => true
+    #   current_controller?(:commits)        # => false
+    #   current_controller?(:commits, :tree) # => true
+    def current_controller?(*args)
+      args.any? { |v| v.to_s.downcase == controller.controller_name }
+    end
+
+    # Check if a particular action is the current one
+    #
+    # args - One or more action names to check
+    #
+    # Examples
+    #
+    #   # On Projects#new
+    #   current_action?(:new)           # => true
+    #   current_action?(:create)        # => false
+    #   current_action?(:new, :create)  # => true
+    def current_action?(*args)
+      args.any? { |v| v.to_s.downcase == action_name }
+    end
+
+    def date_from_to(from, to)
+      "#{from.to_s(:short)} - #{to.to_s(:short)}"
+    end
+
+    def body_data_page
+      path = controller.controller_path.split('/')
+      namespace = path.first if path.second
+
+      [namespace, controller.controller_name, controller.action_name].compact.join(":")
+    end
+
+    def duration_in_words(finished_at, started_at)
+      if finished_at && started_at
+        interval_in_seconds = finished_at.to_i - started_at.to_i
+      elsif started_at
+        interval_in_seconds = Time.now.to_i - started_at.to_i
+      end
+
+      time_interval_in_words(interval_in_seconds)
+    end
+
+    def time_interval_in_words(interval_in_seconds)
+      minutes = interval_in_seconds / 60
+      seconds = interval_in_seconds - minutes * 60
+
+      if minutes >= 1
+        "#{pluralize(minutes, "minute")} #{pluralize(seconds, "second")}"
+      else
+        "#{pluralize(seconds, "second")}"
+      end
+    end
+  end
+end

app/helpers/ci/builds_helper.rb

+module Ci
+  module BuildsHelper
+    def build_ref_link build
+      gitlab_ref_link build.project, build.ref
+    end
+
+    def build_compare_link build
+      gitlab_compare_link build.project, build.commit.short_before_sha, build.short_sha
+    end
+
+    def build_commit_link build
+      gitlab_commit_link build.project, build.short_sha
+    end
+
+    def build_url(build)
+      ci_project_build_url(build.project, build)
+    end
+
+    def build_status_alert_class(build)
+      if build.success?
+        'alert-success'
+      elsif build.failed?
+        'alert-danger'
+      elsif build.canceled?
+        'alert-disabled'
+      else
+        'alert-warning'
+      end
+    end
+
+    def build_icon_css_class(build)
+      if build.success?
+        'fa-circle cgreen'
+      elsif build.failed?
+        'fa-circle cred'
+      else
+        'fa-circle light'
+      end
+    end
+  end
+end

app/helpers/ci/commits_helper.rb

+module Ci
+  module CommitsHelper
+    def commit_status_alert_class(commit)
+      return 'alert-info' unless commit
+
+      case commit.status
+      when 'success'
+        'alert-success'
+      when 'failed', 'canceled'
+        'alert-danger'
+      when 'skipped'
+        'alert-disabled'
+      else
+        'alert-warning'
+      end
+    end
+
+    def ci_commit_path(commit)
+      ci_project_ref_commits_path(commit.project, commit.ref, commit.sha)
+    end
+
+    def commit_link(commit)
+      link_to(commit.short_sha, ci_commit_path(commit))
+    end
+
+    def truncate_first_line(message, length = 50)
+      truncate(message.each_line.first.chomp, length: length) if message
+    end
+
+    def ci_commit_title(commit)
+      content_tag :span do
+        link_to(
+          simple_sanitize(commit.project.name), ci_project_path(commit.project)
+        ) + ' @ ' +
+          gitlab_commit_link(@project, @commit.sha)
+      end
+    end
+  end
+end

app/helpers/ci/gitlab_helper.rb

+module Ci
+  module GitlabHelper
+    def no_turbolink
+      { :"data-no-turbolink" => "data-no-turbolink" }
+    end
+
+    def gitlab_ref_link project, ref
+      gitlab_url = project.gitlab_url.dup
+      gitlab_url << "/commits/#{ref}"
+      link_to ref, gitlab_url, no_turbolink
+    end
+
+    def gitlab_compare_link project, before, after
+      gitlab_url = project.gitlab_url.dup
+      gitlab_url << "/compare/#{before}...#{after}"
+
+      link_to "#{before}...#{after}", gitlab_url, no_turbolink
+    end
+
+    def gitlab_commit_link project, sha
+      gitlab_url = project.gitlab_url.dup
+      gitlab_url << "/commit/#{sha}"
+      link_to Ci::Commit.truncate_sha(sha), gitlab_url, no_turbolink
+    end
+
+    def yaml_web_editor_link(project)
+      commits = project.commits
+
+      if commits.any? && commits.last.push_data[:ci_yaml_file]
+        "#{@project.gitlab_url}/edit/master/.gitlab-ci.yml"
+      else
+        "#{@project.gitlab_url}/new/master"
+      end
+    end
+  end
+end

app/helpers/ci/icons_helper.rb

+module Ci
+  module IconsHelper
+    def boolean_to_icon(value)
+      if value.to_s == "true"
+        content_tag :i, nil, class: 'fa fa-circle cgreen'
+      else
+        content_tag :i, nil, class: 'fa fa-power-off clgray'
+      end
+    end
+  end
+end

app/helpers/ci/projects_helper.rb

+module Ci
+  module ProjectsHelper
+    def ref_tab_class ref = nil
+      'active' if ref == @ref
+    end
+
+    def success_ratio(success_builds, failed_builds)
+      failed_builds = failed_builds.count(:all)
+      success_builds = success_builds.count(:all)
+
+      return 100 if failed_builds.zero?
+
+      ratio = (success_builds.to_f / (success_builds + failed_builds)) * 100
+      ratio.to_i
+    end
+
+    def markdown_badge_code(project, ref)
+      url = status_ci_project_url(project, ref: ref, format: 'png')
+      "[![build status](#{url})](#{ci_project_url(project, ref: ref)})"
+    end
+
+    def html_badge_code(project, ref)
+      url = status_ci_project_url(project, ref: ref, format: 'png')
+      "<a href='#{ci_project_url(project, ref: ref)}'><img src='#{url}' /></a>"
+    end
+
+    def project_uses_specific_runner?(project)
+      project.runners.any?
+    end
+
+    def no_runners_for_project?(project)
+      project.runners.blank? &&
+        Ci::Runner.shared.blank?
+    end
+  end
+end

app/helpers/ci/routes_helper.rb

+module Ci
+  module RoutesHelper
+    class Base
+      include Gitlab::Application.routes.url_helpers
+
+      def default_url_options
+        {
+          host: Settings.gitlab['host'],
+          protocol: Settings.gitlab['https'] ? "https" : "http",
+          port: Settings.gitlab['port']
+        }
+      end
+    end
+
+    def url_helpers
+      @url_helpers ||= Base.new
+    end
+
+    def self.method_missing(method, *args, &block)
+      @url_helpers ||= Base.new
+
+      if @url_helpers.respond_to?(method)
+        @url_helpers.send(method, *args, &block)
+      else
+        super method, *args, &block
+      end
+    end
+  end
+end

app/helpers/ci/runners_helper.rb

+module Ci
+  module RunnersHelper
+    def runner_status_icon(runner)
+      unless runner.contacted_at
+        return content_tag :i, nil,
+          class: "fa fa-warning-sign",
+          title: "New runner. Has not connected yet"
+      end
+
+      status =
+        if runner.active?
+          runner.contacted_at > 3.hour.ago ? :online : :offline
+        else
+          :paused
+        end
+
+      content_tag :i, nil,
+        class: "fa fa-circle runner-status-#{status}",
+        title: "Runner is #{status}, last contact was #{time_ago_in_words(runner.contacted_at)} ago"
+    end
+  end
+end

app/helpers/ci/triggers_helper.rb

+module Ci
+  module TriggersHelper
+    def ci_build_trigger_url(project_id, ref_name)
+      "#{Settings.gitlab_ci.url}/ci/api/v1/projects/#{project_id}/refs/#{ref_name}/trigger"
+    end
+  end
+end

app/helpers/ci/user_helper.rb

+module Ci
+  module UserHelper
+    def user_avatar_url(user = nil, size = nil, default = 'identicon')
+      size = 40 if size.nil? || size <= 0
+
+      if user.blank? || user.avatar_url.blank?
+        'ci/no_avatar.png'
+      elsif /^(http(s?):\/\/(www|secure)\.gravatar\.com\/avatar\/(\w*))/ =~ user.avatar_url
+        Regexp.last_match[0] + "?s=#{size}&d=#{default}"
+      else
+        user.avatar_url
+      end
+    end
+  end
+end

app/helpers/groups_helper.rb

@@ -27,7 +27,7 @@ module GroupsHelper
     if group && group.avatar.present?
       group.avatar.url
     else
-      image_path('no_group_avatar.png')
+      'no_group_avatar.png'
     end
   end
 

app/mailers/ci/emails/builds.rb

+module Ci
+  module Emails
+    module Builds
+      def build_fail_email(build_id, to)
+        @build = Ci::Build.find(build_id)
+        @project = @build.project
+        mail(to: to, subject: subject("Build failed for #{@project.name}", @build.short_sha))
+      end
+
+      def build_success_email(build_id, to)
+        @build = Ci::Build.find(build_id)
+        @project = @build.project
+        mail(to: to, subject: subject("Build success for #{@project.name}", @build.short_sha))
+      end
+    end
+  end
+end

app/mailers/ci/notify.rb

+module Ci
+  class Notify < ActionMailer::Base
+    include Ci::Emails::Builds
+
+    add_template_helper Ci::ApplicationHelper
+    add_template_helper Ci::GitlabHelper
+
+    default_url_options[:host]     = Gitlab.config.gitlab.host
+    default_url_options[:protocol] = Gitlab.config.gitlab.protocol
+    default_url_options[:port]     = Gitlab.config.gitlab.port unless Gitlab.config.gitlab_on_standard_port?
+    default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root
+
+    default from: Gitlab.config.gitlab.email_from
+
+    # Just send email with 3 seconds delay
+    def self.delay
+      delay_for(2.seconds)
+    end
+
+    private
+
+    # Formats arguments into a String suitable for use as an email subject
+    #
+    # extra - Extra Strings to be inserted into the subject
+    #
+    # Examples
+    #
+    #   >> subject('Lorem ipsum')
+    #   => "GitLab-CI | Lorem ipsum"
+    #
+    #   # Automatically inserts Project name when @project is set
+    #   >> @project = Project.last
+    #   => #<Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...>
+    #   >> subject('Lorem ipsum')
+    #   => "GitLab-CI | Ruby on Rails | Lorem ipsum "
+    #
+    #   # Accepts multiple arguments
+    #   >> subject('Lorem ipsum', 'Dolor sit amet')
+    #   => "GitLab-CI | Lorem ipsum | Dolor sit amet"
+    def subject(*extra)
+      subject = "GitLab-CI"
+      subject << (@project ? " | #{@project.name}" : "")
+      subject << " | " + extra.join(' | ') if extra.present?
+      subject
+    end
+  end
+end

app/models/ability.rb

@@ -149,6 +149,7 @@ class Ability
         :admin_merge_request,
         :create_merge_request,
         :create_wiki,
+        :manage_builds,
         :push_code
       ]
     end

app/models/ci/application_setting.rb

+# == Schema Information
+#
+# Table name: application_settings
+#
+#  id                :integer          not null, primary key
+#  all_broken_builds :boolean
+#  add_pusher        :boolean
+#  created_at        :datetime
+#  updated_at        :datetime
+#
+
+module Ci
+  class ApplicationSetting < ActiveRecord::Base
+    extend Ci::Model
+    
+    def self.current
+      Ci::ApplicationSetting.last
+    end
+
+    def self.create_from_defaults
+      create(
+        all_broken_builds: Settings.gitlab_ci['all_broken_builds'],
+        add_pusher: Settings.gitlab_ci['add_pusher'],
+      )
+    end
+  end
+end

app/models/ci/build.rb

+# == Schema Information
+#
+# Table name: builds
+#
+#  id                 :integer          not null, primary key
+#  project_id         :integer
+#  status             :string(255)
+#  finished_at        :datetime
+#  trace              :text
+#  created_at         :datetime
+#  updated_at         :datetime
+#  started_at         :datetime
+#  runner_id          :integer
+#  commit_id          :integer
+#  coverage           :float
+#  commands           :text
+#  job_id             :integer
+#  name               :string(255)
+#  options            :text
+#  allow_failure      :boolean          default(FALSE), not null
+#  stage              :string(255)
+#  deploy             :boolean          default(FALSE)
+#  trigger_request_id :integer
+#
+
+module Ci
+  class Build < ActiveRecord::Base
+    extend Ci::Model
+    
+    LAZY_ATTRIBUTES = ['trace']
+
+    belongs_to :commit, class_name: 'Ci::Commit'
+    belongs_to :project, class_name: 'Ci::Project'
+    belongs_to :runner, class_name: 'Ci::Runner'
+    belongs_to :trigger_request, class_name: 'Ci::TriggerRequest'
+
+    serialize :options
+
+    validates :commit, presence: true
+    validates :status, presence: true
+    validates :coverage, numericality: true, allow_blank: true
+
+    scope :running, ->() { where(status: "running") }
+    scope :pending, ->() { where(status: "pending") }
+    scope :success, ->() { where(status: "success") }
+    scope :failed, ->() { where(status: "failed")  }
+    scope :unstarted, ->() { where(runner_id: nil) }
+    scope :running_or_pending, ->() { where(status:[:running, :pending]) }
+
+    acts_as_taggable
+
+    # To prevent db load megabytes of data from trace
+    default_scope -> { select(Ci::Build.columns_without_lazy) }
+
+    class << self
+      def columns_without_lazy
+        (column_names - LAZY_ATTRIBUTES).map do |column_name|
+          "#{table_name}.#{column_name}"
+        end
+      end
+
+      def last_month
+        where('created_at > ?', Date.today - 1.month)
+      end
+
+      def first_pending
+        pending.unstarted.order('created_at ASC').first
+      end
+
+      def create_from(build)
+        new_build = build.dup
+        new_build.status = :pending
+        new_build.runner_id = nil
+        new_build.save
+      end
+
+      def retry(build)
+        new_build = Ci::Build.new(status: :pending)
+        new_build.options = build.options
+        new_build.commands = build.commands
+        new_build.tag_list = build.tag_list
+        new_build.commit_id = build.commit_id
+        new_build.project_id = build.project_id
+        new_build.name = build.name
+        new_build.allow_failure = build.allow_failure
+        new_build.stage = build.stage
+        new_build.trigger_request = build.trigger_request
+        new_build.save
+        new_build
+      end
+    end
+
+    state_machine :status, initial: :pending do
+      event :run do
+        transition pending: :running
+      end
+
+      event :drop do
+        transition running: :failed
+      end
+
+      event :success do
+        transition running: :success
+      end
+
+      event :cancel do
+        transition [:pending, :running] => :canceled
+      end
+
+      after_transition pending: :running do |build, transition|
+        build.update_attributes started_at: Time.now
+      end
+
+      after_transition any => [:success, :failed, :canceled] do |build, transition|
+        build.update_attributes finished_at: Time.now
+        project = build.project
+
+        if project.web_hooks?
+          Ci::WebHookService.new.build_end(build)
+        end
+
+        if build.commit.success?
+          build.commit.create_next_builds(build.trigger_request)
+        end
+
+        project.execute_services(build)
+
+        if project.coverage_enabled?
+          build.update_coverage
+        end
+      end
+
+      state :pending, value: 'pending'
+      state :running, value: 'running'
+      state :failed, value: 'failed'
+      state :success, value: 'success'
+      state :canceled, value: 'canceled'
+    end
+
+    delegate :sha, :short_sha, :before_sha, :ref,
+      to: :commit, prefix: false
+
+    def trace_html
+      html = Ci::Ansi2html::convert(trace) if trace.present?
+      html ||= ''
+    end
+
+    def trace
+      if project && read_attribute(:trace).present?
+        read_attribute(:trace).gsub(project.token, 'xxxxxx')
+      end
+    end
+
+    def started?
+      !pending? && !canceled? && started_at
+    end
+
+    def active?
+      running? || pending?
+    end
+
+    def complete?
+      canceled? || success? || failed?
+    end
+
+    def ignored?
+      failed? && allow_failure?
+    end
+
+    def timeout
+      project.timeout
+    end
+
+    def variables
+      yaml_variables + project_variables + trigger_variables
+    end
+
+    def duration
+      if started_at && finished_at
+        finished_at - started_at
+      elsif started_at
+        Time.now - started_at
+      end
+    end
+
+    def project
+      commit.project
+    end
+
+    def project_id
+      commit.project_id
+    end
+
+    def project_name
+      project.name
+    end
+
+    def repo_url
+      project.repo_url_with_auth
+    end
+
+    def allow_git_fetch
+      project.allow_git_fetch
+    end
+
+    def update_coverage
+      coverage = extract_coverage(trace, project.coverage_regex)
+
+      if coverage.is_a? Numeric
+        update_attributes(coverage: coverage)
+      end
+    end
+
+    def extract_coverage(text, regex)
+      begin
+        matches = text.gsub(Regexp.new(regex)).to_a.last
+        coverage = matches.gsub(/\d+(\.\d+)?/).first
+
+        if coverage.present?
+          coverage.to_f
+        end
+      rescue => ex
+        # if bad regex or something goes wrong we dont want to interrupt transition
+        # so we just silentrly ignore error for now
+      end
+    end
+
+    def trace
+      if File.exist?(path_to_trace)
+        File.read(path_to_trace)
+      else
+        # backward compatibility
+        read_attribute :trace
+      end
+    end
+
+    def trace=(trace)
+      unless Dir.exists? dir_to_trace
+        FileUtils.mkdir_p dir_to_trace
+      end
+
+      File.write(path_to_trace, trace)
+    end
+
+    def dir_to_trace
+      File.join(
+        Settings.gitlab_ci.builds_path,
+        created_at.utc.strftime("%Y_%m"),
+        project.id.to_s
+      )
+    end
+
+    def path_to_trace
+      "#{dir_to_trace}/#{id}.log"
+    end
+
+    private
+
+    def yaml_variables
+      if commit.config_processor
+        commit.config_processor.variables.map do |key, value|
+          { key: key, value: value, public: true }
+        end
+      else
+        []
+      end
+    end
+
+    def project_variables
+      project.variables.map do |variable|
+        { key: variable.key, value: variable.value, public: false }
+      end
+    end
+
+    def trigger_variables
+      if trigger_request && trigger_request.variables
+        trigger_request.variables.map do |key, value|
+          { key: key, value: value, public: false }
+        end
+      else
+        []
+      end
+    end
+  end
+end

app/models/ci/event.rb

+# == Schema Information
+#
+# Table name: events
+#
+#  id          :integer          not null, primary key
+#  project_id  :integer
+#  user_id     :integer
+#  is_admin    :integer
+#  description :text
+#  created_at  :datetime
+#  updated_at  :datetime
+#
+
+module Ci
+  class Event < ActiveRecord::Base
+    extend Ci::Model
+    
+    belongs_to :project, class_name: 'Ci::Project'
+
+    validates :description,
+      presence: true,
+      length: { in: 5..200 }
+
+    scope :admin, ->(){ where(is_admin: true) }
+    scope :project_wide, ->(){ where(is_admin: false) }
+  end
+end

app/models/project_services/gitlab_issue_tracker_service.rb

@@ -19,7 +19,7 @@
 #
 
 class GitlabIssueTrackerService < IssueTrackerService
-  include Rails.application.routes.url_helpers
+  include Gitlab::Application.routes.url_helpers
 
   prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url
 

app/models/project_services/jira_service.rb

@@ -19,7 +19,7 @@
 #
 
 class JiraService < IssueTrackerService
-  include Rails.application.routes.url_helpers
+  include Gitlab::Application.routes.url_helpers
 
   prop_accessor :title, :description, :project_url, :issues_url, :new_issue_url