summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-0911-10/+131
|\
| * Allow custom text on 'almost there' pageSean McGivern2016-06-082-1/+7
| | | | | | | | | | | | | | | | Add a new application setting, after_sign_up_text. This is text to be rendered as Markdown and shown on the 'almost there' page after a user signs up, but before they've confirmed their account. Tweak the styles for that page so that centered lists look reasonable.
| * Remove notification settings in batchesYorick Peterse2016-06-082-4/+31
| | | | | | | | | | | | | | | | | | | | | | This improves performance of the duplicate notification settings migration by removing duplicates in batches instead of using one big "DELETE FROM" query. The previous query would locally run over 45 minutes without even finishing. This new setup finished in a matter of seconds. Fixes #18289
| * Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-072-0/+8
| |\ | | | | | | | | | | | | | | | | | | Ability to prioritize labels Closes #14189 See merge request !4009
| | * Sort by label priorityThijs Wouters2016-06-062-0/+8
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-073-6/+22
| |\ \
| | * | Fix missed colorize methods.Connor Shea2016-06-061-6/+6
| | | |
| | * | Merge branch 'issue_3359' into 'master' Yorick Peterse2016-06-062-0/+16
| | |\ \ | | | |/ | | |/| | | | | | | | | Remove duplicated notification settings and add unique index See merge request !4472
| | | * Add index to notification settingsFelipe Artur2016-06-032-0/+16
| | | |
| * | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-062-1/+27
| |\ \ \ | | |/ / | | | | | | | | | | | | # Conflicts: # spec/features/builds_spec.rb
| | * | Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-062-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - To hold registrations from U2F devices, and to authenticate them. - Previously, `User#two_factor_enabled` was aliased to the `otp_required_for_login` column on `users`. - This commit changes things a bit: - `User#two_factor_enabled` is not a method anymore - `User#two_factor_enabled?` checks both the `otp_required_for_login` column, as well as `U2fRegistration`s - Change all instances of `User#two_factor_enabled` to `User#two_factor_enabled?` - Add the `u2f` gem, and implement registration/authentication at the model level.
| * | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-064-2/+40
| |\ \ \ | | |/ /
| | * | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-033-24/+47
| | |\ \ | | | |/
| | * | Incorportate feedbackZ.J. van de Weg2016-06-013-4/+4
| | | |
| | * | Merge branch 'master' into awardablesZJ van de Weg2016-05-304-3/+33
| | |\ \
| | * \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-254-4/+21
| | |\ \ \
| | * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-187-2/+43
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
| | * | | | | Incorporate feedbackZeger-Jan van de Weg2016-05-111-10/+0
| | | | | | |
| | * | | | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1116-22/+150
| | |\ \ \ \ \
| | * | | | | | Add tests on Awardables and Award EmojiZeger-Jan van de Weg2016-05-101-2/+17
| | | | | | | |
| | * | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-064-21/+69
| | | | | | | |
| * | | | | | | Use pipelines in context of ProjectKamil Trzcinski2016-06-031-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-0314-27/+138
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'remove-dangling-notification-settings' into 'master' Stan Hu2016-05-311-0/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove project notification settings associated with deleted projects On GitLab.com, there are 1560 project notification settings with no valid project all created on 2016-04-15 10:38:53 for some reason. This migration should purge those entries. b8f38437 should prevent this issue from occurring in the first place. Closes gitlab-com/support-forum#678 See merge request !4311
| | * | | | | | Remove project notification settings associated with deleted projectsStan Hu2016-05-311-0/+13
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On GitLab.com, there are 1560 project notification settings with no valid project all created on 2016-04-15 10:38:53 for some reason. This migration should purge those entries. b8f38437 should prevent this issue from occurring in the first place. Closes gitlab-com/support-forum#678
| * | | | | | Remove update of container_registry_token_expire_delayKamil Trzcinski2016-05-311-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not needed when we specify a default.
| * | | | | | Set container_registry_token_expire_delay default to 5Kamil Trzcinski2016-05-312-3/+3
| | | | | | |
| * | | | | | Fix migration informationcontainer-registry-token-ttlKamil Trzcinski2016-05-311-13/+1
| | | | | | |
| * | | | | | Update db/schema.rbKamil Trzcinski2016-05-311-24/+25
| | | | | | |
| * | | | | | Add Application Setting to configure Container Registry token expire delay ↵Kamil Trzcinski2016-05-311-0/+24
| |/ / / / / | | | | | | | | | | | | | | | | | | (default 5min)
| * | | | | Add DB index on users.stateStan Hu2016-05-292-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | Closes #17920
| * | | | | fix rescue block on migrationJames Lopez2016-05-271-1/+1
| | | | | |
| * | | | | Remove main_language and testsremove-main-languageJosh Frye2016-05-252-2/+22
| | |_|_|/ | |/| | |
| * | | | Merge branch 'issue_14632' into 'master' Douwe Maan2016-05-201-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix group visibility level migration in case all visibility levels are restricted fixes #14632 See merge request !4107
| | * | | | Fix group visibility level migration in case all visibility levels are ↵issue_14632Felipe Artur2016-05-191-1/+3
| | | |/ / | | |/| | | | | | | | | | | | restricted
| * | | | Updated the DB schemaYorick Peterse2016-05-191-3/+4
| | | | |
| * | | | Use migration helper to prevent downtime migrationfeature/runner-config-untagged-jobsGrzegorz Bizon2016-05-191-8/+10
| | | | |
| * | | | Add not null constraint to run untagged runner optionGrzegorz Bizon2016-05-192-2/+2
| | | | |
| * | | | Add runner db field for ability to run untagged jobsGrzegorz Bizon2016-05-192-0/+12
| | | | |
| * | | | Mask credentials from URL when import of project has failed.Rubén Dávila2016-05-181-1/+1
| | |_|/ | |/| |
| * | | Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-161-0/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
| | * | | fix default send confirmation valueFelipe Artur2016-05-161-1/+1
| | | | |
| | * | | Change landing page when skipping confirmation email and add documentationFelipe Artur2016-05-161-1/+1
| | | | |
| | * | | Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-162-8/+12
| | | | |
| | * | | Toggle email signup confirmation in admin settingsFelipe Artur2016-05-161-0/+8
| | | | |
| * | | | Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-162-0/+6
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
| | * | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-134-2/+18
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| | * | | | Rename `images` to `container_registry`Kamil Trzcinski2016-05-092-2/+2
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-093-10/+19
| | |\ \ \ \
| | * | | | | Added authentication service for docker registryKamil Trzcinski2016-04-292-0/+6
| | | | | | |
View Lorry Controller Status