summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Random selection now also works for MySQLseed-fu-award-emojiZ.J. van de Weg2016-06-151-3/+3
|
* Near half of the Issues get Award Emoji when seedingZ.J. van de Weg2016-06-151-4/+4
|
* Skip system notes from receiving award emojiZ.J. van de Weg2016-06-151-4/+10
|
* Seed Award Emoji while seeding the databaseZ.J. van de Weg2016-06-151-0/+27
|
* Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-144-11/+38
|\ | | | | | | | | # Conflicts: # app/views/layouts/nav/_project.html.haml
| * Merge branch 'artifacts-expire-date' into 'master' Rémy Coutable2016-06-142-2/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Artifacts expire date What do you think @grzesiek? The syntax will be simple: ``` job: artifacts: expire_in: 7d ``` - [x] Implement `expire_in` - [x] Check current design of expiry information with @jschatz1 and @markpundsack - [x] Add tests in GitLab application for a `ExpireBuildArtifactsWorker` and for `ArtifactsController::keep` - [x] Add user documentation how to use `artifacts:expire_in` - [x] Prepare GitLab Runner changes to pass `expire_in`: gitlab-org/gitlab-ci-multi-runner!191 - [x] Fix `timeago` with help of @jschatz1 - [x] Merge latest master after builds view changes @iamphill - [ ] Add Omnibus support for `expire_build_artifacts_worker` cron job - [ ] Add documentation how to configure `expire_build_artifacts_worker` This is based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4201. See merge request !4200
| | * Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-142-2/+6
| | |\
| | * | Update db/schema.rbKamil Trzcinski2016-06-131-6/+6
| | | |
| | * | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-133-0/+39
| | |\ \
| | * | | Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+5
| | | | |
| * | | | Fixed locking syntax for PostgreSQLYorick Peterse2016-06-141-1/+1
| | | | |
| * | | | Move LOCK TABLES to a separate executeYorick Peterse2016-06-141-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL apparently doesn't support executing multiple queries in the same `execute` call so we have to use a separate one for the "LOCK TABLES" statement.
| * | | | Fix MySQL migration, obtain lock the right wayZ.J. van de Weg2016-06-141-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by @yorrickpeterse in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4581#note_12373882 the locking of the MySQL database wasn't correct.
| * | | | Fix timing issues on convertion migration award emojiZ.J. van de Weg2016-06-142-10/+33
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit does two things: 1. It adds logic which prevents timing issues when running the migration. During the migration, notes can be created which _should_ be award emoji and thus migrated. To prevent these timing issues, a lock is obtained on the table (MySQL) or on Transaction level (PG). 2. There was no down migration before as you'd probably lose some data. Data effected is all awards on notes. These could be migrated back, as the noteable type would just be Note, though this would litter the DB with data which should not be there. This down migration does not yet delete the table.
* | | | Add request access for groupsRémy Coutable2016-06-143-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Initial implementation of user access request to projectsDavid Alexander2016-06-142-0/+6
|/ / /
* | | Remove deprecated issues_tracker and issues_tracker_id from projectDouglas Barbosa Alexandre2016-06-132-2/+6
| | |
* | | Schema doesn’t reflect the changes of the last 3 migrationsDouglas Barbosa Alexandre2016-06-131-4/+3
| |/ |/| | | | | | | | | | | | | The schema doesn’t reflect the changes of the last 3 migrations: * 20160610140403_remove_notification_setting_not_null_constraints.rb * 20160610201627_migrate_users_notification_level.rb * 20160610301627_remove_notification_level_from_users.rb
* | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-133-0/+39
|\ \ | |/ |/| | | | | | | | | Remove notification level from user model part of #3359 See merge request !4494
| * Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-104-25/+33
| |
| * Remove notification level from user modelFelipe Artur2016-06-102-0/+31
| |
* | Cache the presence of an issue_tracker at project levelPaco Guzman2016-06-102-0/+11
|/ | | | | | Using update_column to store the boolean flag to avoid any side effects with the current state of the project instance
* Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to ↵Rémy Coutable2016-06-101-18/+18
| | | | | | | | #mergeable_ci_state? The logic of the method was obviously inverted. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Allow or not merge MR with failed buildRui Anderson2016-06-102-0/+16
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Enable RuboCop for migrationsenable-rubocop-for-migrationsSean McGivern2016-06-09342-0/+342
| | | | | | | Migrations shouldn't fail RuboCop checks - especially lint checks, such as the nested method check. To avoid changing code in existing migrations, add the magic comment to the top of each of them to skip that file.
* 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 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
| | | | | |