Merge branch 'master' into 46082-runner-contacted_at-is-not-always-a-time-type

GITALY_SERVER_VERSION

-0.98.0
+0.99.0

Gemfile

@@ -218,9 +218,6 @@ gem 'ruby-fogbugz', '~> 0.2.1'
 # Kubernetes integration
 gem 'kubeclient', '~> 3.0'
 
-# d3
-gem 'd3_rails', '~> 3.5.0'
-
 # Sanitize user input
 gem 'sanitize', '~> 2.0'
 gem 'babosa', '~> 1.0.2'
@@ -434,4 +431,4 @@ gem 'lograge', '~> 0.5'
 gem 'grape_logging', '~> 1.7'
 
 # Asset synchronization
-gem 'asset_sync', '~> 2.2.0'
+gem 'asset_sync', '~> 2.4'

Gemfile.lock

@@ -59,7 +59,7 @@ GEM
     asciidoctor (1.5.6.2)
     asciidoctor-plantuml (0.0.8)
       asciidoctor (~> 1.5)
-    asset_sync (2.2.0)
+    asset_sync (2.4.0)
       activemodel (>= 4.1.0)
       fog-core
       mime-types (>= 2.99)
@@ -147,8 +147,6 @@ GEM
     creole (0.5.0)
     css_parser (1.5.0)
       addressable
-    d3_rails (3.5.11)
-      railties (>= 3.1.0)
     daemons (1.2.3)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
@@ -197,7 +195,7 @@ GEM
     et-orbi (1.0.3)
       tzinfo
     eventmachine (1.0.8)
-    excon (0.60.0)
+    excon (0.62.0)
     execjs (2.6.0)
     expression_parser (0.9.0)
     factory_bot (4.8.2)
@@ -998,7 +996,7 @@ DEPENDENCIES
   asana (~> 0.6.0)
   asciidoctor (~> 1.5.6)
   asciidoctor-plantuml (= 0.0.8)
-  asset_sync (~> 2.2.0)
+  asset_sync (~> 2.4)
   attr_encrypted (~> 3.1.0)
   awesome_print (~> 1.2.0)
   babosa (~> 1.0.2)
@@ -1024,7 +1022,6 @@ DEPENDENCIES
   concurrent-ruby (~> 1.0.5)
   connection_pool (~> 2.0)
   creole (~> 0.5.0)
-  d3_rails (~> 3.5.0)
   database_cleaner (~> 1.5.0)
   deckar01-task_list (= 2.0.0)
   default_value_for (~> 3.0.0)

app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js

@@ -82,7 +82,6 @@ export default () => {
 
         this.service
           .fetchCycleAnalyticsData(fetchOptions)
-          .then(resp => resp.json())
           .then((response) => {
             this.store.setCycleAnalyticsData(response);
             this.selectDefaultStage();
@@ -116,7 +115,6 @@ export default () => {
             stage,
             startDate: this.startDate,
           })
-          .then(resp => resp.json())
           .then((response) => {
             this.isEmptyStage = !response.events.length;
             this.store.setStageEvents(response.events, stage);

app/assets/javascripts/cycle_analytics/cycle_analytics_service.js

-import Vue from 'vue';
-import VueResource from 'vue-resource';
-
-Vue.use(VueResource);
+import axios from '~/lib/utils/axios_utils';
 
 export default class CycleAnalyticsService {
   constructor(options) {
-    this.requestPath = options.requestPath;
-    this.cycleAnalytics = Vue.resource(this.requestPath);
+    this.axios = axios.create({
+      baseURL: options.requestPath,
+    });
   }
 
   fetchCycleAnalyticsData(options = { startDate: 30 }) {
-    return this.cycleAnalytics.get({ cycle_analytics: { start_date: options.startDate } });
+    return this.axios
+      .get('', {
+        params: {
+          'cycle_analytics[start_date]': options.startDate,
+        },
+      })
+      .then(x => x.data);
   }
 
   fetchStageData(options) {
@@ -19,12 +23,12 @@ export default class CycleAnalyticsService {
       startDate,
     } = options;
 
-    return Vue.http.get(`${this.requestPath}/events/${stage.name}.json`, {
-      params: {
-        cycle_analytics: {
-          start_date: startDate,
+    return this.axios
+      .get(`events/${stage.name}.json`, {
+        params: {
+          'cycle_analytics[start_date]': startDate,
         },
-      },
-    });
+      })
+      .then(x => x.data);
   }
 }

app/assets/javascripts/deploy_keys/service/index.js

-import Vue from 'vue';
-import VueResource from 'vue-resource';
-
-Vue.use(VueResource);
+import axios from '~/lib/utils/axios_utils';
 
 export default class DeployKeysService {
   constructor(endpoint) {
-    this.endpoint = endpoint;
-
-    this.resource = Vue.resource(
-      `${this.endpoint}{/id}`,
-      {},
-      {
-        enable: {
-          method: 'PUT',
-          url: `${this.endpoint}{/id}/enable`,
-        },
-        disable: {
-          method: 'PUT',
-          url: `${this.endpoint}{/id}/disable`,
-        },
-      },
-    );
+    this.axios = axios.create({
+      baseURL: endpoint,
+    });
   }
 
   getKeys() {
-    return this.resource.get().then(response => response.json());
+    return this.axios.get()
+      .then(response => response.data);
   }
 
   enableKey(id) {
-    return this.resource.enable({ id }, {});
+    return this.axios.put(`${id}/enable`)
+      .then(response => response.data);
   }
 
   disableKey(id) {
-    return this.resource.disable({ id }, {});
+    return this.axios.put(`${id}/disable`)
+      .then(response => response.data);
   }
 }

app/assets/javascripts/ide/lib/common/model.js

@@ -14,12 +14,12 @@ export default class Model {
       (this.originalModel = this.monaco.editor.createModel(
         head ? head.content : this.file.raw,
         undefined,
-        new this.monaco.Uri(null, null, `original/${this.file.key}`),
+        new this.monaco.Uri(null, null, `original/${this.path}`),
       )),
       (this.model = this.monaco.editor.createModel(
         this.content,
         undefined,
-        new this.monaco.Uri(null, null, this.file.key),
+        new this.monaco.Uri(null, null, this.path),
       )),
     );
     if (this.file.mrChange) {
@@ -27,7 +27,7 @@ export default class Model {
         (this.baseModel = this.monaco.editor.createModel(
           this.file.baseRaw,
           undefined,
-          new this.monaco.Uri(null, null, `target/${this.file.path}`),
+          new this.monaco.Uri(null, null, `target/${this.path}`),
         )),
       );
     }

app/assets/javascripts/ide/stores/actions/file.js

@@ -196,6 +196,8 @@ export const unstageChange = ({ commit }, path) => {
 };
 
 export const openPendingTab = ({ commit, getters, dispatch, state }, { file, keyPrefix }) => {
+  if (getters.activeFile && getters.activeFile.key === `${keyPrefix}-${file.key}`) return false;
+
   state.openFiles.forEach(f => eventHub.$emit(`editor.update.model.dispose.${f.key}`));
 
   commit(types.ADD_PENDING_TAB, { file, keyPrefix });

app/assets/stylesheets/framework/buttons.scss

@@ -106,10 +106,6 @@
   @include btn-color($red-500, $red-600, $red-600, $red-700, $red-700, $red-800, $white-light);
 }
 
-@mixin btn-gray {
-  @include btn-color($gray-light, $border-gray-normal, $gray-normal, $border-gray-normal, $gray-dark, $border-gray-dark, $gl-text-color);
-}
-
 @mixin btn-white {
   @include btn-color($white-light, $border-color, $white-normal, $border-white-normal, $white-dark, $border-gray-dark, $gl-text-color);
 }
@@ -183,10 +179,6 @@
     }
   }
 
-  &.btn-gray {
-    @include btn-gray;
-  }
-
   &.btn-info,
   &.btn-primary,
   &.btn-register {

app/assets/stylesheets/pages/projects.scss

@@ -205,7 +205,6 @@
 .project-repo-buttons,
 .group-buttons {
   .btn {
-    @include btn-gray;
     padding: 3px 10px;
 
     &:last-child {
@@ -294,7 +293,7 @@
     }
 
     .count {
-      @include btn-gray;
+      @include btn-white;
       display: inline-block;
       background: $white-light;
       border-radius: 2px;

app/assets/stylesheets/print.scss

@@ -36,7 +36,9 @@ ul.notes-form,
 .gutter-toggle,
 .issuable-details .content-block-small,
 .edit-link,
-.note-action-button {
+.note-action-button,
+.right-sidebar,
+.flash-container {
   display: none !important;
 }
 
@@ -53,3 +55,7 @@ pre {
 .right-sidebar {
   top: 0;
 }
+
+a[href]::after {
+  content: none !important;
+}

app/controllers/import/base_controller.rb

@@ -7,9 +7,9 @@ class Import::BaseController < ApplicationController
 
   def find_jobs(import_type)
     current_user.created_projects
-        .includes(:import_state)
-        .where(import_type: import_type)
-        .to_json(only: [:id], methods: [:import_status])
+      .includes(:import_state)
+      .where(import_type: import_type)
+      .to_json(only: [:id], methods: [:import_status])
   end
 
   def find_or_create_namespace(names, owner)

app/models/ci/runner.rb

@@ -58,6 +58,7 @@ module Ci
     validate :tag_constraints
     validate :either_projects_or_group
     validates :access_level, presence: true
+    validates :runner_type, presence: true
 
     acts_as_taggable
 

app/models/clusters/applications/runner.rb

@@ -43,12 +43,20 @@ module Clusters
 
       def create_and_assign_runner
         transaction do
-          project.runners.create!(name: 'kubernetes-cluster', tag_list: %w(kubernetes cluster)).tap do |runner|
+          project.runners.create!(runner_create_params).tap do |runner|
             update!(runner_id: runner.id)
           end
         end
       end
 
+      def runner_create_params
+        {
+          name: 'kubernetes-cluster',
+          runner_type: :project_type,
+          tag_list: %w(kubernetes cluster)
+        }
+      end
+
       def gitlab_url
         Gitlab::Routing.url_helpers.root_url(only_path: false)
       end

app/models/repository.rb

@@ -37,7 +37,7 @@ class Repository
                       changelog license_blob license_key gitignore koding_yml
                       gitlab_ci_yml branch_names tag_names branch_count
                       tag_count avatar exists? root_ref has_visible_content?
-                      issue_template_names merge_request_template_names).freeze
+                      issue_template_names merge_request_template_names xcode_project?).freeze
 
   # Methods that use cache_method but only memoize the value
   MEMOIZED_CACHED_METHODS = %i(license).freeze
@@ -55,7 +55,8 @@ class Repository
     gitlab_ci: :gitlab_ci_yml,
     avatar: :avatar,
     issue_template: :issue_template_names,
-    merge_request_template: :merge_request_template_names
+    merge_request_template: :merge_request_template_names,
+    xcode_config: :xcode_project?
   }.freeze
 
   def initialize(full_path, project, disk_path: nil, is_wiki: false)
@@ -594,6 +595,11 @@ class Repository
   end
   cache_method :gitlab_ci_yml
 
+  def xcode_project?
+    file_on_head(:xcode_config).present?
+  end
+  cache_method :xcode_project?
+
   def head_commit
     @head_commit ||= commit(self.root_ref)
   end

app/services/users/migrate_to_ghost_user_service.rb

@@ -49,7 +49,7 @@ module Users
       migrate_merge_requests
       migrate_notes
       migrate_abuse_reports
-      migrate_award_emojis
+      migrate_award_emoji
     end
 
     def migrate_issues
@@ -70,7 +70,7 @@ module Users
       user.reported_abuse_reports.update_all(reporter_id: ghost_user.id)
     end
 
-    def migrate_award_emojis
+    def migrate_award_emoji
       user.award_emoji.update_all(user_id: ghost_user.id)
     end
   end

app/views/groups/runners/_group_runners.html.haml

-- link = link_to 'Runners API', help_page_path('api/runners.md')
+- link = link_to _('Runners API'), help_page_path('api/runners.md')
 
 %h3
   = _('Group Runners')

app/views/groups/runners/edit.html.haml

-- page_title "Edit", "#{@runner.description} ##{@runner.id}", "Runners"
+- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", 'Runners'
 
 %h4 Runner ##{@runner.id}
 

app/views/help/_shortcuts.html.haml

 #modal-shortcuts.modal{ tabindex: -1 }
-  .modal-dialog
+  .modal-dialog.modal-lg
     .modal-content
       .modal-header
         %a.close{ href: "#", "data-dismiss" => "modal" } ×

app/views/help/ui.html.haml

@@ -74,10 +74,10 @@
         = lorem
 
       .cover-controls
-        = link_to '#', class: 'btn btn-gray' do
+        = link_to '#', class: 'btn btn-default' do
           = icon('pencil')
          
-        = link_to '#', class: 'btn btn-gray' do
+        = link_to '#', class: 'btn btn-default' do
           = icon('rss')
 
   %h2#lists Lists
@@ -206,7 +206,6 @@
 
   .example
     %button.btn.btn-default{ :type => "button" } Default
-    %button.btn.btn-gray{ :type => "button" } Gray
     %button.btn.btn-primary{ :type => "button" } Primary
     %button.btn.btn-success{ :type => "button" } Success
     %button.btn.btn-info{ :type => "button" } Info

app/views/projects/runners/_group_runners.html.haml

-- link = link_to 'Runners API', help_page_path('api/runners.md')
+- link = link_to _('Runners API'), help_page_path('api/runners.md')
 
 %h3
   = _('Group Runners')
@@ -25,7 +25,7 @@
   = _('This group does not provide any group Runners yet.')
 
   - if can?(current_user, :admin_pipeline, @project.group)
-    - group_link = link_to 'Group CI/CD settings', group_settings_ci_cd_path(@project.group)
+    - group_link = link_to _('Group CI/CD settings'), group_settings_ci_cd_path(@project.group)
     = _('Group masters can register group runners in the %{link}').html_safe % { link: group_link }
   - else
     = _('Ask your group master to setup a group Runner.')

app/views/projects/runners/_shared_runners.html.haml

-%h3 Shared Runners
+%h3
+  = _('Shared Runners')
 
 .bs-callout.shared-runners-description
   - if Gitlab::CurrentSettings.shared_runners_text.present?
@@ -17,8 +18,7 @@
     for this project
 
 - if @shared_runners_count.zero?
-  This GitLab instance does not provide any shared Runners yet. Instance
-  administrators can register shared Runners in the admin area.
+  = _('This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area.')
 - else
   %h4.underlined-title Available shared Runners : #{@shared_runners_count}
   %ul.bordered-list.available-shared-runners

app/views/projects/runners/_specific_runners.html.haml

-%h3 Specific Runners
+%h3
+  = _('Specific Runners')
 
 = render partial: 'ci/runner/how_to_setup_specific_runner',
          locals: { registration_token: @project.runners_token }

app/views/projects/runners/edit.html.haml

-- page_title "Edit", "#{@runner.description} ##{@runner.id}", "Runners"
+- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", 'Runners'
 
 %h4 Runner ##{@runner.id}
 

app/views/shared/runners/_form.html.haml

@@ -20,11 +20,11 @@
         %span.light Indicates whether this runner can pick jobs without tags
   - unless runner.group_type?
     .form-group
-      = label :locked, 'Lock to current projects', class: 'control-label'
+      = label :locked, _('Lock to current projects'), class: 'control-label'
       .col-sm-10
         .checkbox
           = f.check_box :locked
-          %span.light When a runner is locked, it cannot be assigned to other projects
+          %span.light= _('When a runner is locked, it cannot be assigned to other projects')
   .form-group
     = label_tag :token, class: 'control-label' do
       Token

app/views/shared/runners/show.html.haml

@@ -21,17 +21,17 @@
         %th Value
     %tr
       %td Active
-      %td= @runner.active? ? 'Yes' : 'No'
+      %td= @runner.active? ? _('Yes') : _('No')
     %tr
       %td Protected
-      %td= @runner.ref_protected? ? 'Yes' : 'No'
+      %td= @runner.ref_protected? ? _('Yes') : _('No')
     %tr
-      %td Can run untagged jobs
-      %td= @runner.run_untagged? ? 'Yes' : 'No'
+      %td= _('Can run untagged jobs')
+      %td= @runner.run_untagged? ? _('Yes') : _('No')
     - unless @runner.group_type?
       %tr
-        %td Locked to this project
-        %td= @runner.locked? ? 'Yes' : 'No'
+        %td= _('Locked to this project')
+        %td= @runner.locked? ? _('Yes') : _('No')
     %tr
       %td Tags
       %td
@@ -60,7 +60,7 @@
       %td Description
       %td= @runner.description
     %tr
-      %td Maximum job timeout
+      %td= _('Maximum job timeout')
       %td= @runner.maximum_timeout_human_readable
     %tr
       %td Last contact

app/views/users/show.html.haml

@@ -12,7 +12,7 @@
   .cover-block.user-cover-block.top-area
     .cover-controls
       - if @user == current_user
-        = link_to profile_path, class: 'btn btn-gray has-tooltip', title: 'Edit profile', 'aria-label': 'Edit profile' do
+        = link_to profile_path, class: 'btn btn-default has-tooltip', title: 'Edit profile', 'aria-label': 'Edit profile' do
           = icon('pencil')
       - elsif current_user
         - if @user.abuse_report
@@ -20,13 +20,13 @@
             data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } }
             = icon('exclamation-circle')
         - else
-          = link_to new_abuse_report_path(user_id: @user.id, ref_url: request.referrer), class: 'btn btn-gray',
+          = link_to new_abuse_report_path(user_id: @user.id, ref_url: request.referrer), class: 'btn',
             title: 'Report abuse', data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
             = icon('exclamation-circle')
-      = link_to user_path(@user, rss_url_options), class: 'btn btn-gray has-tooltip', title: 'Subscribe', 'aria-label': 'Subscribe' do
+      = link_to user_path(@user, rss_url_options), class: 'btn btn-default has-tooltip', title: 'Subscribe', 'aria-label': 'Subscribe' do
         = icon('rss')
       - if current_user && current_user.admin?
-        = link_to [:admin, @user], class: 'btn btn-gray', title: 'View user in admin area',
+        = link_to [:admin, @user], class: 'btn btn-default', title: 'View user in admin area',
           data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
           = icon('users')
 

changelogs/unreleased/23465-print-markdown.yml

+---
+title: Fix print styles for markdown pages
+merge_request:
+author:
+type: fixed

changelogs/unreleased/44319-remove-gray-buttons.yml

+---
+title: Remove gray button styles
+merge_request:
+author:
+type: fixed

changelogs/unreleased/5750-backport-checksum-git-commanderror-exit-status-128.yml

+---
+title: Raise NoRepository error for non-valid repositories when calculating repository
+  checksum
+merge_request: 18594
+author:
+type: fixed

changelogs/unreleased/blackst0ne-replace-spinach-project-ff-merge-requests-feature.yml

+---
+title: 'Replace the `project/ff_merge_requests.feature` spinach test with an rspec analog'
+merge_request: 18800
+author: '@blackst0ne'
+type: other

changelogs/unreleased/fix-gb-add-pipeline-builds-foreign-key.yml

+---
+title: Add database foreign key constraint between pipelines and build
+merge_request: 18822
+author:
+type: fixed

changelogs/unreleased/fix-project-mirror-data-schema.yml

+---
+title: Fixes database inconsistencies between Community and Enterprise Edition on
+  import state
+merge_request: 18811
+author:
+type: fixed

changelogs/unreleased/fix-shorcut-modal.yml

+---
+title: Fix modal width of shorcuts help page
+merge_request: 18766
+author: Lars Greiss
+type: fixed

changelogs/unreleased/support-active-setting-while-registering-a-runner.yml

+---
+title: Add support for 'active' setting on Runner Registration API endpoint
+merge_request: 18848
+author:
+type: changed

db/migrate/20130102143055_rename_owner_to_creator_for_project.rb

-# rubocop:disable all
-class RenameOwnerToCreatorForProject < ActiveRecord::Migration
-  def change
-    rename_column :projects, :owner_id, :creator_id
-  end
-end

db/migrate/20130110172407_add_public_to_project.rb

-# rubocop:disable all
-class AddPublicToProject < ActiveRecord::Migration
-  def change
-    add_column :projects, :public, :boolean, default: false, null: false
-  end
-end

db/migrate/20130123114545_add_issues_tracker_to_project.rb

-# rubocop:disable all
-class AddIssuesTrackerToProject < ActiveRecord::Migration
-  def change
-    add_column :projects, :issues_tracker, :string, default: :gitlab, null: false
-  end
-end

db/migrate/20130125090214_add_user_permissions.rb

-# rubocop:disable all
-class AddUserPermissions < ActiveRecord::Migration
-  def up
-    add_column :users, :can_create_group, :boolean, default: true, null: false
-    add_column :users, :can_create_team, :boolean, default: true, null: false
-  end
-
-  def down
-    remove_column :users, :can_create_group
-    remove_column :users, :can_create_team
-  end
-end

db/migrate/20130131070232_remove_private_flag_from_project.rb

-# rubocop:disable all
-class RemovePrivateFlagFromProject < ActiveRecord::Migration
-  def up
-    remove_column :projects, :private_flag
-  end
-
-  def down
-    add_column :projects, :private_flag, :boolean, default: true, null: false
-  end
-end

db/migrate/20130206084024_add_description_to_namsespace.rb

-# rubocop:disable all
-class AddDescriptionToNamsespace < ActiveRecord::Migration
-  def change
-    add_column :namespaces, :description, :string, default: '', null: false
-  end
-end

db/migrate/20130207104426_add_description_to_teams.rb

-# rubocop:disable all
-class AddDescriptionToTeams < ActiveRecord::Migration
-  def change
-    add_column :user_teams, :description, :string, default: '', null: false
-  end
-end

db/migrate/20130211085435_add_issues_tracker_id_to_project.rb

-# rubocop:disable all
-class AddIssuesTrackerIdToProject < ActiveRecord::Migration
-  def change
-    add_column :projects, :issues_tracker_id, :string
-  end
-end

db/migrate/20130214154045_rename_state_to_merge_status_in_milestone.rb

-# rubocop:disable all
-class RenameStateToMergeStatusInMilestone < ActiveRecord::Migration
-  def change
-    rename_column :merge_requests, :state, :merge_status
-  end
-end

db/migrate/20130218140952_add_state_to_issue.rb

-# rubocop:disable all
-class AddStateToIssue < ActiveRecord::Migration
-  def change
-    add_column :issues, :state, :string
-  end
-end

db/migrate/20130218141038_add_state_to_merge_request.rb

-# rubocop:disable all
-class AddStateToMergeRequest < ActiveRecord::Migration
-  def change
-    add_column :merge_requests, :state, :string
-  end
-end

db/migrate/20130218141117_add_state_to_milestone.rb

-# rubocop:disable all
-class AddStateToMilestone < ActiveRecord::Migration
-  def change
-    add_column :milestones, :state, :string
-  end
-end

db/migrate/20130218141258_convert_closed_to_state_in_issue.rb

-# rubocop:disable all
-class ConvertClosedToStateInIssue < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  def up
-    execute "UPDATE #{table_name} SET state = 'closed' WHERE closed = #{true_value}"
-    execute "UPDATE #{table_name} SET state = 'opened' WHERE closed = #{false_value}"
-  end
-
-  def down
-    execute "UPDATE #{table_name} SET closed = #{true_value} WHERE state = 'closed'"
-  end
-
-  private
-
-  def table_name
-    Issue.table_name
-  end
-end

db/migrate/20130218141327_convert_closed_to_state_in_merge_request.rb

-# rubocop:disable all
-class ConvertClosedToStateInMergeRequest < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  def up
-    execute "UPDATE #{table_name} SET state = 'merged' WHERE closed = #{true_value} AND merged = #{true_value}"
-    execute "UPDATE #{table_name} SET state = 'closed' WHERE closed = #{true_value} AND merged = #{false_value}"
-    execute "UPDATE #{table_name} SET state = 'opened' WHERE closed = #{false_value}"
-  end
-
-  def down
-    execute "UPDATE #{table_name} SET closed = #{true_value} WHERE state = 'closed'"
-    execute "UPDATE #{table_name} SET closed = #{true_value}, merged = #{true_value} WHERE state = 'merged'"
-  end
-
-  private
-
-  def table_name
-    MergeRequest.table_name
-  end
-end

db/migrate/20130218141344_convert_closed_to_state_in_milestone.rb

-# rubocop:disable all
-class ConvertClosedToStateInMilestone < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  def up
-    execute "UPDATE #{table_name} SET state = 'closed' WHERE closed = #{true_value}"
-    execute "UPDATE #{table_name} SET state = 'active' WHERE closed = #{false_value}"
-  end
-
-  def down
-    execute "UPDATE #{table_name} SET closed = #{true_value} WHERE state = 'cloesd'"
-  end
-
-  private
-
-  def table_name
-    Milestone.table_name
-  end
-end

db/migrate/20130218141444_remove_merged_from_merge_request.rb

-# rubocop:disable all
-class RemoveMergedFromMergeRequest < ActiveRecord::Migration
-  def up
-    remove_column :merge_requests, :merged
-  end
-
-  def down
-    add_column :merge_requests, :merged, :boolean, default: true, null: false
-  end
-end

db/migrate/20130218141507_remove_closed_from_issue.rb

-# rubocop:disable all
-class RemoveClosedFromIssue < ActiveRecord::Migration
-  def up
-    remove_column :issues, :closed
-  end
-
-  def down
-    add_column :issues, :closed, :boolean
-  end
-end

db/migrate/20130218141536_remove_closed_from_merge_request.rb

-# rubocop:disable all
-class RemoveClosedFromMergeRequest < ActiveRecord::Migration
-  def up
-    remove_column :merge_requests, :closed
-  end
-
-  def down
-    add_column :merge_requests, :closed, :boolean
-  end
-end

db/migrate/20130218141554_remove_closed_from_milestone.rb

-# rubocop:disable all
-class RemoveClosedFromMilestone < ActiveRecord::Migration
-  def up
-    remove_column :milestones, :closed
-  end
-
-  def down
-    add_column :milestones, :closed, :boolean
-  end
-end

db/migrate/20130220124204_add_new_merge_status_to_merge_request.rb

-# rubocop:disable all
-class AddNewMergeStatusToMergeRequest < ActiveRecord::Migration
-  def change
-    add_column :merge_requests, :new_merge_status, :string
-  end
-end

db/migrate/20130220125544_convert_merge_status_in_merge_request.rb

-# rubocop:disable all
-class ConvertMergeStatusInMergeRequest < ActiveRecord::Migration
-  def up
-    execute "UPDATE #{table_name} SET new_merge_status = 'unchecked' WHERE merge_status = 1"
-    execute "UPDATE #{table_name} SET new_merge_status = 'can_be_merged' WHERE merge_status = 2"
-    execute "UPDATE #{table_name} SET new_merge_status = 'cannot_be_merged' WHERE merge_status = 3"
-  end
-
-  def down
-    execute "UPDATE #{table_name} SET merge_status = 1 WHERE new_merge_status = 'unchecked'"
-    execute "UPDATE #{table_name} SET merge_status = 2 WHERE new_merge_status = 'can_be_merged'"
-    execute "UPDATE #{table_name} SET merge_status = 3 WHERE new_merge_status = 'cannot_be_merged'"
-  end
-
-  private
-
-  def table_name
-    MergeRequest.table_name
-  end
-end

db/migrate/20130220125545_remove_merge_status_from_merge_request.rb

-# rubocop:disable all
-class RemoveMergeStatusFromMergeRequest < ActiveRecord::Migration
-  def up
-    remove_column :merge_requests, :merge_status
-  end
-
-  def down
-    add_column :merge_requests, :merge_status, :integer
-  end
-end

db/migrate/20130220133245_rename_new_merge_status_to_merge_status_in_milestone.rb

-# rubocop:disable all
-class RenameNewMergeStatusToMergeStatusInMilestone < ActiveRecord::Migration
-  def change
-    rename_column :merge_requests, :new_merge_status, :merge_status
-  end
-end

db/migrate/20130304104623_add_state_to_user.rb

-# rubocop:disable all
-class AddStateToUser < ActiveRecord::Migration
-  def change
-    add_column :users, :state, :string
-  end
-end

db/migrate/20130304104740_convert_blocked_to_state.rb

-# rubocop:disable all
-class ConvertBlockedToState < ActiveRecord::Migration
-  def up
-    User.transaction do
-      User.where(blocked: true).update_all(state: :blocked)
-      User.where(blocked: false).update_all(state: :active)
-    end
-  end
-
-  def down
-    User.transaction do
-      User.where(state: :blocked).update_all(blocked: :true)
-    end
-  end
-end

db/migrate/20130304105317_remove_blocked_from_user.rb

-# rubocop:disable all
-class RemoveBlockedFromUser < ActiveRecord::Migration
-  def up
-    remove_column :users, :blocked
-  end
-
-  def down
-    add_column :users, :blocked, :boolean
-  end
-end

db/migrate/20130315124931_user_color_scheme.rb

-# rubocop:disable all
-class UserColorScheme < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  def up
-    add_column :users, :color_scheme_id, :integer, null: false, default: 1
-    execute("UPDATE users SET color_scheme_id = 2 WHERE dark_scheme = #{true_value}")
-    remove_column :users, :dark_scheme
-  end
-
-  def down
-    add_column :users, :dark_scheme, :boolean, null: false, default: false
-    remove_column :users, :color_scheme_id
-  end
-end

db/migrate/20130318212250_add_snippets_to_features.rb

-# rubocop:disable all
-class AddSnippetsToFeatures < ActiveRecord::Migration
-  def change
-    add_column :projects, :snippets_enabled, :boolean, null: false, default: true
-  end
-end

db/migrate/20130319214458_create_forked_project_links.rb

-# rubocop:disable all
-class CreateForkedProjectLinks < ActiveRecord::Migration
-  DOWNTIME = false
-
-  def change
-    create_table :forked_project_links do |t|
-      t.integer :forked_to_project_id, null: false
-      t.integer :forked_from_project_id, null: false
-
-      t.timestamps null: true
-    end
-    add_index :forked_project_links, :forked_to_project_id, unique: true
-  end
-end

db/migrate/20130323174317_add_private_to_snippets.rb

-# rubocop:disable all
-class AddPrivateToSnippets < ActiveRecord::Migration
-  def change
-    add_column :snippets, :private, :boolean, null: false, default: true
-  end
-end

db/migrate/20130324151736_add_type_to_snippets.rb

-# rubocop:disable all
-class AddTypeToSnippets < ActiveRecord::Migration
-  def change
-    add_column :snippets, :type, :string
-  end
-end

db/migrate/20130324172327_change_project_id_to_null_in_snipepts.rb

-# rubocop:disable all
-class ChangeProjectIdToNullInSnipepts < ActiveRecord::Migration
-  def up
-    change_column :snippets, :project_id, :integer, :null => true
-  end
-
-  def down
-    change_column :snippets, :project_id, :integer, :null => false
-  end
-end

db/migrate/20130324203535_add_type_value_for_snippets.rb

-# rubocop:disable all
-class AddTypeValueForSnippets < ActiveRecord::Migration
-  def up
-    Snippet.where("project_id IS NOT NULL").update_all(type: 'ProjectSnippet')
-  end
-
-  def down
-  end
-end

db/migrate/20130325173941_add_notification_level_to_user.rb

-# rubocop:disable all
-class AddNotificationLevelToUser < ActiveRecord::Migration
-  def change
-    add_column :users, :notification_level, :integer, null: false, default: 1
-  end
-end

db/migrate/20130326142630_add_index_to_users_authentication_token.rb

-# rubocop:disable all
-class AddIndexToUsersAuthenticationToken < ActiveRecord::Migration
-  def change
-    add_index :users, :authentication_token, unique: true
-  end
-end

db/migrate/20130403003950_add_last_activity_column_into_project.rb

-# rubocop:disable all
-class AddLastActivityColumnIntoProject < ActiveRecord::Migration
-  def up
-    add_column :projects, :last_activity_at, :datetime
-    add_index :projects, :last_activity_at
-
-    select_all('SELECT id, updated_at FROM projects').each do |project|
-      project_id = project['id']
-      update_date = project['updated_at']
-      event = select_one("SELECT created_at FROM events WHERE project_id = #{project_id} ORDER BY created_at DESC LIMIT 1")
-
-      if event && event['created_at']
-        update_date = event['created_at']
-      end
-
-      execute("UPDATE projects SET last_activity_at = '#{update_date}' WHERE id = #{project_id}")
-    end
-  end
-
-  def down
-    remove_index :projects, :last_activity_at
-    remove_column :projects, :last_activity_at
-  end
-end

db/migrate/20130404164628_add_notification_level_to_user_project.rb

-# rubocop:disable all
-class AddNotificationLevelToUserProject < ActiveRecord::Migration
-  def change
-    add_column :users_projects, :notification_level, :integer, null: false, default: 3
-  end
-end

db/migrate/20130410175022_remove_wiki_table.rb

-# rubocop:disable all
-class RemoveWikiTable < ActiveRecord::Migration
-  def up
-    drop_table :wikis
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end

db/migrate/20130419190306_allow_merges_for_forks.rb

-# rubocop:disable all
-class AllowMergesForForks < ActiveRecord::Migration
-  def self.up
-    add_column :merge_requests, :target_project_id, :integer, :null => true
-    execute "UPDATE #{table_name} SET target_project_id = project_id"
-    change_column :merge_requests, :target_project_id, :integer, :null => false
-    rename_column :merge_requests, :project_id, :source_project_id
-  end
-
-  def self.down
-    remove_column :merge_requests, :target_project_id
-    rename_column :merge_requests, :source_project_id,:project_id
-  end
-
-  private
-
-  def table_name
-    MergeRequest.table_name
-  end
-end

db/migrate/20130506085413_add_type_to_key.rb

-# rubocop:disable all
-class AddTypeToKey < ActiveRecord::Migration
-  def change
-    add_column :keys, :type, :string
-  end
-end

db/migrate/20130506090604_create_deploy_keys_projects.rb

-# rubocop:disable all
-class CreateDeployKeysProjects < ActiveRecord::Migration
-  DOWNTIME = false
-
-  def change
-    create_table :deploy_keys_projects do |t|
-      t.integer :deploy_key_id, null: false
-      t.integer :project_id, null: false
-
-      t.timestamps null: true
-    end
-  end
-end

db/migrate/20130506095501_remove_project_id_from_key.rb

-# rubocop:disable all
-class RemoveProjectIdFromKey < ActiveRecord::Migration
-  def up
-    puts 'Migrate deploy keys: '
-    Key.where('project_id IS NOT NULL').update_all(type: 'DeployKey')
-
-    DeployKey.all.each do |key|
-      project = Project.find_by(id: key.project_id)
-      if project
-        project.deploy_keys << key
-        print '.'
-      end
-    end
-
-    puts 'Done'
-
-    remove_column :keys, :project_id
-  end
-
-  def down
-    add_column :keys, :project_id, :integer
-  end
-end

db/migrate/20130522141856_add_more_fields_to_service.rb

-# rubocop:disable all
-class AddMoreFieldsToService < ActiveRecord::Migration
-  def change
-    add_column :services, :subdomain, :string
-    add_column :services, :room, :string
-  end
-end

db/migrate/20130528184641_add_system_to_notes.rb

-# rubocop:disable all
-class AddSystemToNotes < ActiveRecord::Migration
-  class Note < ActiveRecord::Base
-  end
-
-  def up
-    add_column :notes, :system, :boolean, default: false, null: false
-
-    Note.reset_column_information
-    Note.update_all(system: false)
-    Note.where("note like '_status changed to%'").update_all(system: true)
-  end
-
-  def down
-    remove_column :notes, :system
-  end
-end

db/migrate/20130611210815_increase_snippet_text_column_size.rb

-# rubocop:disable all
-class IncreaseSnippetTextColumnSize < ActiveRecord::Migration
-  def up
-    # MYSQL LARGETEXT for snippet
-    change_column :snippets, :content, :text, :limit => 4294967295
-  end
-
-  def down
-  end
-end

db/migrate/20130613165816_add_password_expires_at_to_users.rb

-# rubocop:disable all
-class AddPasswordExpiresAtToUsers < ActiveRecord::Migration
-  def change
-    add_column :users, :password_expires_at, :datetime
-  end
-end

db/migrate/20130613173246_add_created_by_id_to_user.rb

-# rubocop:disable all
-class AddCreatedByIdToUser < ActiveRecord::Migration
-  def change
-    add_column :users, :created_by_id, :integer
-  end
-end

db/migrate/20130614132337_add_improted_to_project.rb

-# rubocop:disable all
-class AddImprotedToProject < ActiveRecord::Migration
-  def change
-    add_column :projects, :imported, :boolean, default: false, null: false
-  end
-end

db/migrate/20130617095603_create_users_groups.rb

-# rubocop:disable all
-class CreateUsersGroups < ActiveRecord::Migration
-  DOWNTIME = false
-
-  def change
-    create_table :users_groups do |t|
-      t.integer :group_access, null: false
-      t.integer :group_id, null: false
-      t.integer :user_id, null: false
-
-      t.timestamps null: true
-    end
-  end
-end

db/migrate/20130621195223_add_notification_level_to_user_group.rb

-# rubocop:disable all
-class AddNotificationLevelToUserGroup < ActiveRecord::Migration
-  def change
-    add_column :users_groups, :notification_level, :integer, null: false, default: 3
-  end
-end

db/migrate/20130622115340_add_more_db_index.rb

-# rubocop:disable all
-class AddMoreDbIndex < ActiveRecord::Migration
-  def change
-    add_index :deploy_keys_projects, :project_id
-    add_index :web_hooks, :project_id
-    add_index :protected_branches, :project_id
-
-    add_index :users_groups, :user_id
-    add_index :snippets, :author_id
-    add_index :notes, :author_id
-    add_index :notes, [:noteable_id, :noteable_type]
-  end
-end

db/migrate/20130624162710_add_fingerprint_to_key.rb

-# rubocop:disable all
-class AddFingerprintToKey < ActiveRecord::Migration
-  def change
-    add_column :keys, :fingerprint, :string
-    remove_column :keys, :identifier
-  end
-end

db/migrate/20130711063759_create_project_group_links.rb

-# rubocop:disable all
-class CreateProjectGroupLinks < ActiveRecord::Migration
-  DOWNTIME = false
-
-  def change
-    create_table :project_group_links do |t|
-      t.integer :project_id, null: false
-      t.integer :group_id, null: false
-
-      t.timestamps null: true
-    end
-  end
-end

db/migrate/20130804151314_add_st_diff_to_note.rb

-# rubocop:disable all
-class AddStDiffToNote < ActiveRecord::Migration
-  def change
-    add_column :notes, :st_diff, :text, :null => true
-  end
-end

db/migrate/20130809124851_add_permission_check_to_user.rb

-# rubocop:disable all
-class AddPermissionCheckToUser < ActiveRecord::Migration
-  def change
-    add_column :users, :last_credential_check_at, :datetime
-  end
-end

db/migrate/20130812143708_add_import_url_to_project.rb

-# rubocop:disable all
-class AddImportUrlToProject < ActiveRecord::Migration
-  def change
-    add_column :projects, :import_url, :string
-  end
-end

db/migrate/20130819182730_add_internal_ids_to_issues_and_mr.rb

-# rubocop:disable all
-class AddInternalIdsToIssuesAndMr < ActiveRecord::Migration
-  def change
-    add_column :issues, :iid, :integer
-    add_column :merge_requests, :iid, :integer
-  end
-end

db/migrate/20130820102832_add_access_to_project_group_link.rb

-# rubocop:disable all
-class AddAccessToProjectGroupLink < ActiveRecord::Migration
-  def change
-    add_column :project_group_links, :group_access, :integer, null: false, default: ProjectGroupLink.default_access
-  end
-end

db/migrate/20130821090530_remove_deprecated_tables.rb

-# rubocop:disable all
-class RemoveDeprecatedTables < ActiveRecord::Migration
-  def up
-    drop_table :user_teams
-    drop_table :user_team_project_relationships
-    drop_table :user_team_user_relationships
-  end
-
-  def down
-    raise 'No rollback for this migration'
-  end
-end

db/migrate/20130821090531_add_internal_ids_to_milestones.rb

-# rubocop:disable all
-class AddInternalIdsToMilestones < ActiveRecord::Migration
-  def change
-    add_column :milestones, :iid, :integer
-  end
-end

db/migrate/20130909132950_add_description_to_merge_request.rb

-# rubocop:disable all
-class AddDescriptionToMergeRequest < ActiveRecord::Migration
-  def change
-    add_column :merge_requests, :description, :text, null: true
-  end
-end

db/migrate/20130926081215_change_owner_id_for_group.rb

-# rubocop:disable all
-class ChangeOwnerIdForGroup < ActiveRecord::Migration
-  def up
-    change_column :namespaces, :owner_id, :integer, null: true
-  end
-
-  def down
-    change_column :namespaces, :owner_id, :integer, null: false
-  end
-end

db/migrate/20131005191208_add_avatar_to_users.rb

-# rubocop:disable all
-class AddAvatarToUsers < ActiveRecord::Migration
-  def change
-    add_column :users, :avatar, :string
-  end
-end

db/migrate/20131009115346_add_confirmable_to_users.rb

-# rubocop:disable all
-class AddConfirmableToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :confirmation_token, :string
-    add_column :users, :confirmed_at, :datetime
-    add_column :users, :confirmation_sent_at, :datetime
-    add_column :users, :unconfirmed_email, :string
-    add_index :users, :confirmation_token, unique: true
-    User.update_all(confirmed_at: Time.now)
-  end
-
-  def self.down
-    remove_column :users, :confirmation_token, :confirmed_at, :confirmation_sent_at
-    remove_column :users, :unconfirmed_email
-  end
-end

db/migrate/20131106151520_remove_default_branch.rb

-# rubocop:disable all
-class RemoveDefaultBranch < ActiveRecord::Migration
-  def up
-    remove_column :projects, :default_branch
-  end
-
-  def down
-    add_column :projects, :default_branch, :string
-  end
-end