summaryrefslogtreecommitdiff
path: root/db
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-10-052-2/+6
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-052-2/+6
| |\ | | | | | | | | | See merge request !1512
| | * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-052-2/+6
| | | | | | | | | | | | | | | | | | This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
* | | Merge branch 'user-preferences-layout-option' of ↵Dmitriy Zaporozhets2015-10-052-1/+7
|\ \ \ | |/ / |/| | | | | | | | | | | https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | improved code style and layout option namingPeter Göbel2015-10-051-1/+1
| | |
| * | added user preference to change layout widthPeter Göbel2015-10-052-1/+7
| |/
* | Fix db/schema.rbKamil Trzcinski2015-10-051-58/+36
| |
* | Make commit_spec runKamil Trzcinski2015-10-051-37/+64
| |
* | Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-054-5/+8
| |
* | Refactor commit and buildKamil Trzcinski2015-10-054-0/+24
|/
* Update db schemaDmitriy Zaporozhets2015-10-011-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-012-1/+7
|
* Fix migrationmerge-ci-dataKamil Trzcinski2015-09-301-1/+1
|
* Delegate ci_project parameters to projectsKamil Trzcinski2015-09-302-2/+11
| | | | | | | - It delegates name, path, gitlab_url, ssh_url_to_repo - Remove ability to set this parameters using CI API This fixes GitLab project rename, namespace change, repository rename, etc.
* Fix migrationsKamil Trzcinski2015-09-292-23/+11
|
* Fix db/schema.rbKamil Trzcinski2015-09-291-26/+29
|
* Fix migrationsKamil Trzcinski2015-09-295-32/+15
|
* WIPKamil Trzcinski2015-09-291-37/+43
|
* WIPKamil Trzcinski2015-09-293-0/+32
|
* Remove deleted milestones from merge requestsStan Hu2015-09-211-0/+5
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9643
* Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diffDouwe Maan2015-09-202-1/+7
|
* Merge branch 'rs-bump-two-factor' into 'master' Douwe Maan2015-09-203-2/+8
|\ | | | | | | | | | | | | | | | | Bump devise-two-factor to 2.0.0 Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43 See merge request !1363
| * Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-192-1/+7
| | | | | | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43
| * Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-191-1/+1
| |
* | fix failing migration on mysqlHannes Rosenögger2015-09-181-1/+1
|/ | | | | | | | We didn't specify that the db user needs the right to create temporary tables before. That's why the migration will fail on most installations. This commits removes the "TEMPORARY" from the migration and changes the documentation to include the necessary rights for the future.
* Allow to disable GitLab CIKamil Trzcinski2015-09-182-1/+7
|
* Allow custom info to be added to Help pageJeroen van Baarsen2015-09-182-0/+6
| | | | | | Fixes #2536 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Fix schema downgrade introduced by: ↵fix-schema-downgradeKamil Trzcinski2015-09-171-1/+2
| | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299
* enable SSL by defaultenable_ssl_by_defaultValery Sizov2015-09-173-3/+15
|
* Fix ordering issueKamil Trzcinski2015-09-162-1/+7
|
* Add rake task to migrate CI tagsKamil Trzcinski2015-09-152-1/+44
|
* Remove db/ciDmitriy Zaporozhets2015-09-1190-1103/+0
|
* Fix mysql migrationDmitriy Zaporozhets2015-09-091-2/+2
|
* Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-093-1/+21
|\
| * added spinach for glabal labelsglobal_labelsValery Sizov2015-09-031-120/+37
| |
| * CRUD for admin labelsValery Sizov2015-09-032-38/+127
| |
| * Update db schemaDmitriy Zaporozhets2015-09-011-22/+22
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-294-11/+45
| |\
| * | Issue #993: Fixed login failure when extern_uid changesJoel Koglin2015-08-212-1/+15
| | |
* | | Merge CI factories and CI spec/support with GitLabDmitriy Zaporozhets2015-09-091-106/+38
| | |
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-262-7/+12
|\ \ \ | | |/ | |/|
| * | Enable SSL verification for Webhooksenable_ssl_verification_web_hookValery Sizov2015-08-262-7/+13
| | |
* | | Groundwork for merging CI into CEDouwe Maan2015-08-2593-39/+1592
|/ /
* | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-232-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and request them each session. Pass these tokens to the project import data. This prevents the need to encrypt these tokens and clear them in case they expire or get revoked. For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get an Error 500 with no way to recover: ``` Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000 Processing by Import::BitbucketController#status as HTML Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms) NameError (uninitialized constant Import::BitbucketController::Unauthorized): app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized' ``` Closes #1871
* | Merge branch 'master' into reply-by-emailDouwe Maan2015-08-202-0/+12
|\ \ | |/
| * Import sources: settings in the admin interfaceArtem Sidorenko2015-08-202-1/+13
| |
* | Reply by email POCDouwe Maan2015-08-182-1/+25
|/
* Merge branch 'master' into comment-updated-bycomment-updated-byDouwe Maan2015-08-072-1/+20
|\
| * Allow users to send abuse reportsDmitriy Zaporozhets2015-08-062-1/+20
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-302-2/+12
|/
View Lorry Controller Status