summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Deny repository disk access in development and testJacob Vosmaer (GitLab)2018-06-142-2/+6
|
* Revert rename allow collaboration columnMark Chao2018-06-085-6/+51
|
* Merge remote-tracking branch 'origin/master' into ↵Kamil Trzciński2018-06-074-0/+19
|\ | | | | | | 38542-application-control-panel-in-settings-page
| * Merge branch ↵Rémy Coutable2018-06-072-0/+11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | '46241-enable-hashed-storage-for-new-projects-by-default-in-development' into 'master' Resolve "Enable hashed storage for new projects by default in development" Closes #46241 See merge request gitlab-org/gitlab-ce!19488
| | * Enable hashed storage for new projects by default in developmentValery Sizov2018-06-072-0/+11
| | |
| * | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-072-0/+8
| |\ \ | | |/ | |/| | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
| | * allow uploading favicon in appearance settingsAlexis Reigel2018-06-052-0/+8
| | |
* | | Use 0 continuous default for deploy strategyMatija Čupić2018-06-071-1/+1
| | |
* | | Change database deploy strategy default to continuousMatija Čupić2018-06-071-1/+1
| | |
* | | Merge branch 'master' into 38542-application-control-panel-in-settings-pageMatija Čupić2018-06-0618-21/+168
|\ \ \ | |/ /
| * | [Rails5] Fix Arel::UpdateManager callsblackst0ne2018-06-064-4/+8
| | | | | | | | | | | | | | | | | | In Rails 5.0 `Arel::UpdateManager.new` doesn't expect any parameters. This commit makes the migration not pass any parameters if on Rails 5.0.
| * | Migrate jobs in object_storage_upload queueJan Provaznik2018-06-052-1/+17
| | |
| * | Merge branch 'master' into ↵Kamil Trzciński2018-06-054-3/+49
| |\ \ | | | | | | | | | | | | | | | | | | | | 'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
| | * \ Merge branch 'master' into 'rd-44364-deprecate-support-for-dsa-keys'Douwe Maan2018-06-0512-16/+111
| | |\ \ | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | | * \ Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-053-1/+31
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061
| | | | * Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-pushMark Chao2018-06-013-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch" "Maintainer" will be freed to be used for #42751
| | * | | Add migration to disable the usage of DSA keysrd-44364-deprecate-support-for-dsa-keysRubén Dávila2018-06-042-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Additionally the current application setting is also updated to disable the usage of DSA keys.
| * | | | Merge branch 'master' into ↵Grzegorz Bizon2018-06-055-13/+48
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | 'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
| | * | | Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'Kamil Trzciński2018-06-052-1/+36
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add background migrations to archive legacy job traces Closes #46642 See merge request gitlab-org/gitlab-ce!19194
| | | * | | Add type_build to ScheduleToArchiveLegacyTraces::BuildShinya Maeda2018-06-041-1/+3
| | | | | |
| | | * | | Fix specs. Rename migration file name which was conflicted with background ↵Shinya Maeda2018-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | migration's.
| | | * | | Directly refer application code from migration codeShinya Maeda2018-06-041-15/+4
| | | | | |
| | | * | | Add background migrations to arhive legacy tracesShinya Maeda2018-06-042-1/+45
| | | | | |
| | * | | | Support rails5 in postgres indexes function and fix some migrationsJasper Maes2018-06-054-13/+13
| | | | | |
| * | | | | Merge branch 'master' into ↵backstage/gb/use-persisted-stages-to-improve-pipelines-tableGrzegorz Bizon2018-06-0511-4/+181
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 'backstage/gb/use-persisted-stages-to-improve-pipelines-table' Conflicts: app/models/ci/pipeline.rb
| | * | | | Merge branch 'sh-fix-secrets-not-working' into 'master'Douwe Maan2018-06-041-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix attr_encryption key settings Closes #47166 See merge request gitlab-org/gitlab-ce!19341
| | | * | | | Fix missing key change in ↵sh-fix-secrets-not-workingStan Hu2018-06-021-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | 20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb
| | * | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-025-2/+57
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-015-2/+94
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-305-1/+161
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-287-4/+152
| | |\ \ \ \ \
| | * | | | | | Remvoe disable_ddl_transaction! and redandant RecordNotUnique exception rescueShinya Maeda2018-05-221-2/+0
| | | | | | | |
| | * | | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-221-0/+32
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-174-3/+83
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-106-5/+102
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-0989-1138/+375
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-05-0822-2/+466
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Revert column name changeShinya Maeda2018-05-033-6/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | Change column name to iid_per_project. Add index to project_id and iidShinya Maeda2018-05-033-4/+20
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add per-project pipeline idShinya Maeda2018-05-032-0/+16
| | | | | | | | | | | | |
| * | | | | | | | | | | | Make pipeline / stage position index not uniqueGrzegorz Bizon2018-05-312-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add a unique index to stages on pipeline / positionGrzegorz Bizon2018-05-302-1/+17
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Use add_column_with_default in migrationMatija Čupić2018-06-061-4/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Add deploy_strategy to ProjectAutoDevopsMatija Čupić2018-06-012-1/+17
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-bump-ruby-2.4' into 'master'Stan Hu2018-06-012-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Ruby 2.4.4 See merge request gitlab-org/gitlab-ce!19055
| * | | | | | | | | | Upgrade to Ruby 2.4.4sh-bump-ruby-2.4Stan Hu2018-05-292-2/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes that make this work: * A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1) requires passing in the exact required length for OpenSSL keys and IVs. * Ensure the secrets.yml is generated before any prepended modules are loaded. This is done by renaming the `secret_token.rb` initializer to `01_secret_token.rb`, which is a bit ugly but involves the least impact on other files.
* | | | | | | | | | Merge branch '46019-add-missing-migration' into 'master'Yorick Peterse2018-06-011-0/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "ActiveRecord::RecordInvalid: Validation failed: Build timeout needs to be at least 10 minutes" Closes #46019 See merge request gitlab-org/gitlab-ce!18775
| * | | | | | | | | | Add missing migration for minimal Project build_timeoutTomasz Maczukin2018-05-221-0/+19
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '46487-add-support-for-jupyter-in-gitlab-via-kubernetes' into ↵Dmitriy Zaporozhets2018-06-012-0/+36
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Add support for Jupyter in GitLab via Kubernetes" Closes #46487 See merge request gitlab-org/gitlab-ce!19019
| * | | | | | | | | Fix schema.rb46487-add-support-for-jupyter-in-gitlab-via-kubernetesDmitriy Zaporozhets2018-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>