diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2016-09-29 00:18:10 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-29 00:18:10 -0500 |
| commit | 4dc0f3f9b343549fc34a391d37df480214edee08 (patch) | |
| tree | 84eefef5e9bb67dcaadbd6a3239acd1cfe768da1 | |
| parent | 23c297e781da2f8584fd47aecc2544e1a01b886f (diff) | |
| parent | 2cef7d33cb40e4448aeffcc9683c85bee04de040 (diff) | |
| download | gitlab-ce-4dc0f3f9b343549fc34a391d37df480214edee08.tar.gz | |
Merge remote-tracking branch 'gitlab/8-11-stable' into 8-11-stable
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | db/migrate/20140502125220_migrate_repo_size.rb | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be5614520a5..f74a3b46a2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -208,8 +208,12 @@ spinach 9 10 ruby21: *spinach-knapsack-ruby21 rubocop: *exec rake scss_lint: *exec rake brakeman: *exec -rake flog: *exec -rake flay: *exec +rake flog: + <<: *exec + allow_failure: yes +rake flay: + <<: *exec + allow_failure: yes license_finder: *exec rake downtime_check: *exec diff --git a/db/migrate/20140502125220_migrate_repo_size.rb b/db/migrate/20140502125220_migrate_repo_size.rb index 84463727b3b..fd71ec0155e 100644 --- a/db/migrate/20140502125220_migrate_repo_size.rb +++ b/db/migrate/20140502125220_migrate_repo_size.rb @@ -1,5 +1,7 @@ # rubocop:disable all class MigrateRepoSize < ActiveRecord::Migration + DOWNTIME = false + def up project_data = execute('SELECT projects.id, namespaces.path AS namespace_path, projects.path AS project_path FROM projects LEFT JOIN namespaces ON projects.namespace_id = namespaces.id') |