summaryrefslogtreecommitdiff
path: root/db
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-variables-build-job' into 'master' Kamil Trzciński2017-03-071-2/+2
|\
| * Rename BUILD to JOB in CI Variableszj-variables-build-jobZ.J. van de Weg2017-03-071-2/+2
* | Merge branch '28447-hybrid-repository-storages' into 'master' Sean McGivern2017-03-074-5/+5
|\ \
| * | Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-034-5/+5
* | | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-073-0/+63
|\ \ \
| * | | Implement OpenID Connect identity providerMarkus Koller2017-03-073-0/+63
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-073-1/+38
|\ \ \ | |/ / |/| |
| * | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-061-1/+1
| * | applies relevant changes to the code and code structureTiago Botelho2017-02-281-1/+1
| * | add impersonation tokenSimon Vocella2017-02-282-0/+19
| * | manage personal_access_tokens through apiSimon Vocella2017-02-282-1/+19
* | | Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-071-1/+1
|\ \ \
| * | | Fix up @DouweM reviewEric Eastwood2017-03-061-1/+1
* | | | Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-dbDouwe Maan2017-03-062-0/+29
|\ \ \ \
| * \ \ \ Merge branch 'zj-create-mattermost-team' into 'master' Kamil Trzciński2017-03-062-0/+29
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into 'zj-create-mattermost-team'Zeger-Jan van de Weg2017-03-064-2/+34
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-061-2/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Minor edits, incorporate reviewZ.J. van de Weg2017-03-062-6/+4
| | * | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-029-14/+155
| | |\ \ \ \ \
| | * | | | | | Improve UXZ.J. van de Weg2017-03-022-7/+11
| | * | | | | | Fix testsZ.J. van de Weg2017-02-241-2/+3
| | * | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-2414-24/+60
| | |\ \ \ \ \ \
| | * | | | | | | Fix bad merge [ci skip]Z.J. van de Weg2017-02-202-6/+6
| | * | | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-203-3/+16
| | |\ \ \ \ \ \ \
| | * | | | | | | | Improve DRYness of viewsZ.J. van de Weg2017-02-161-2/+2
| | * | | | | | | | Create MM team for GitLab groupZ.J. van de Weg2017-02-162-0/+28
* | | | | | | | | | Add Upload model and UploadChecksumWorker workerRobert Speicher2017-03-062-0/+34
|/ / / / / / / / /
* | | | | | | | | Merge branch 'pipeline-blocking-actions' into 'master' Kamil Trzciński2017-03-062-1/+20
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Migrate legacy actions in post deployment migrationGrzegorz Bizon2017-03-062-1/+1
| * | | | | | | | Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actionsGrzegorz Bizon2017-03-064-2/+34
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Add migration for manual actions with skipped statusGrzegorz Bizon2017-03-062-1/+20
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Remove unecessary defaults for uniq ip block, cleanup refactoring leftoversPawel Chojnacki2017-03-062-7/+6
* | | | | | | | align schema.rb with upstream and fix rubocop warning about not freezing muta...Pawel Chojnacki2017-03-061-2/+3
* | | | | | | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ...Pawel Chojnacki2017-03-062-7/+7
* | | | | | | | Allow limiting logging in users from too many different IPs.Pawel Chojnacki2017-03-062-1/+21
| |/ / / / / / |/| | | | | |
* | | | | | | Move foreign key to separate migrationKamil Trzcinski2017-03-053-3/+13
* | | | | | | Update db/schemaKamil Trzcinski2017-03-053-3/+6
* | | | | | | Make triggers to be user awareKamil Trzcinski2017-03-051-1/+1
* | | | | | | Make Pipeline Triggers to be user awareKamil Trzcinski2017-03-052-0/+19
|/ / / / / /
* | | | | | Fix the `Gitlab::Seeder` monkey patch to disable mail deliveryrs-dev-seed-timeRobert Speicher2017-03-021-2/+2
| |_|_|/ / |/| | | |
* | | | | Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-013-3/+61
|\ \ \ \ \
| * | | | | Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-013-3/+61
| | |_|_|/ | |/| | |
* | | | | Disable the inheritance column of services in DisableInvalidServiceTemplates ...Rémy Coutable2017-03-011-4/+2
|/ / / /
* | | | Fix migration without DOWNTIME clause specifiedRuben Davila2017-02-281-0/+2
* | | | Add development fixtures for nested groupsdz-nested-groups-fixturesDmitriy Zaporozhets2017-02-271-0/+69
* | | | Merge branch 'dm-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-241-9/+1
|\ \ \ \
| * | | | Rename commit_file, commit_dir and remove_file and update specsDouwe Maan2017-02-241-1/+1
| * | | | Consistently create, update, and delete files, taking CRLF settings into accountDouwe Maan2017-02-241-9/+1
* | | | | Remove the default value for the `users.ghost` database column.Timothy Andrew2017-02-242-7/+3
* | | | | Use a `ghost` boolean to track ghost users.Timothy Andrew2017-02-242-0/+16
|/ / / /