Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow to disable GitLab CI | Kamil Trzcinski | 2015-09-18 | 2 | -1/+7 |
| | |||||
* | Allow custom info to be added to Help page | Jeroen van Baarsen | 2015-09-18 | 2 | -0/+6 |
| | | | | | | Fixes #2536 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | ||||
* | Fix schema downgrade introduced by: ↵fix-schema-downgrade | Kamil Trzcinski | 2015-09-17 | 1 | -1/+2 |
| | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299 | ||||
* | enable SSL by defaultenable_ssl_by_default | Valery Sizov | 2015-09-17 | 3 | -3/+15 |
| | |||||
* | Fix ordering issue | Kamil Trzcinski | 2015-09-16 | 2 | -1/+7 |
| | |||||
* | Add rake task to migrate CI tags | Kamil Trzcinski | 2015-09-15 | 2 | -1/+44 |
| | |||||
* | Remove db/ci | Dmitriy Zaporozhets | 2015-09-11 | 90 | -1103/+0 |
| | |||||
* | Fix mysql migration | Dmitriy Zaporozhets | 2015-09-09 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | 2015-09-09 | 3 | -1/+21 |
|\ | |||||
| * | added spinach for glabal labelsglobal_labels | Valery Sizov | 2015-09-03 | 1 | -120/+37 |
| | | |||||
| * | CRUD for admin labels | Valery Sizov | 2015-09-03 | 2 | -38/+127 |
| | | |||||
| * | Update db schema | Dmitriy Zaporozhets | 2015-09-01 | 1 | -22/+22 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993 | Douwe Maan | 2015-08-29 | 4 | -11/+45 |
| |\ | |||||
| * | | Issue #993: Fixed login failure when extern_uid changes | Joel Koglin | 2015-08-21 | 2 | -1/+15 |
| | | | |||||
* | | | Merge CI factories and CI spec/support with GitLab | Dmitriy Zaporozhets | 2015-09-09 | 1 | -106/+38 |
| | | | |||||
* | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Douwe Maan | 2015-08-26 | 2 | -7/+12 |
|\ \ \ | | |/ | |/| | |||||
| * | | Enable SSL verification for Webhooksenable_ssl_verification_web_hook | Valery Sizov | 2015-08-26 | 2 | -7/+13 |
| | | | |||||
* | | | Groundwork for merging CI into CE | Douwe Maan | 2015-08-25 | 93 | -39/+1592 |
|/ / | |||||
* | | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab | Stan Hu | 2015-08-23 | 2 | -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-email | Douwe Maan | 2015-08-20 | 2 | -0/+12 |
|\ \ | |/ | |||||
| * | Import sources: settings in the admin interface | Artem Sidorenko | 2015-08-20 | 2 | -1/+13 |
| | | |||||
* | | Reply by email POC | Douwe Maan | 2015-08-18 | 2 | -1/+25 |
|/ | |||||
* | Merge branch 'master' into comment-updated-bycomment-updated-by | Douwe Maan | 2015-08-07 | 2 | -1/+20 |
|\ | |||||
| * | Allow users to send abuse reports | Dmitriy Zaporozhets | 2015-08-06 | 2 | -1/+20 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Show who last edited a comment if it wasn't the original author | Douwe Maan | 2015-07-30 | 2 | -2/+12 |
|/ | |||||
* | Check if session_expire_delay column exists before adding the column.migrate_session_expire_delay_unless_it_exists | Marin Jankovski | 2015-07-22 | 1 | -2/+4 |
| | |||||
* | Store commit count in project tableadvanced-cache | Dmitriy Zaporozhets | 2015-07-17 | 2 | -1/+7 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Add more seed projects. Control amount with SIZE env variable | Dmitriy Zaporozhets | 2015-07-17 | 1 | -1/+34 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Revert "Change default admin password from "5iveL!fe" to "password"" | Sytse Sijbrandij | 2015-07-14 | 2 | -2/+2 |
| | | | | This reverts commit 8a01a1222875b190d32769f7a6e7a74720079d2a. | ||||
* | Allow user to specify content he wants to see on project pageproject-default-view | Dmitriy Zaporozhets | 2015-07-13 | 2 | -1/+7 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Fix db schema | Dmitriy Zaporozhets | 2015-07-08 | 1 | -9/+1 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Move project activity to separate tab. Add more features to project home page | Dmitriy Zaporozhets | 2015-07-07 | 1 | -3/+11 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Audit log for user authentication | Valery Sizov | 2015-07-06 | 2 | -2/+38 |
| | |||||
* | Change default admin password from "5iveL!fe" to "password" | Robert Speicher | 2015-06-24 | 2 | -2/+2 |
| | |||||
* | Correct AddDefaultOtpRequiredForLoginValue migration | Robert Speicher | 2015-06-22 | 1 | -1/+3 |
| | | | | | Also MySQL complains when you change a field to be not null if any existing records already have a null value, so this updates those rows. | ||||
* | Make default value for otp_required_for_login false instead of null | Robert Speicher | 2015-06-20 | 2 | -2/+11 |
| | |||||
* | Add `dashboard` attribute to User model | Robert Speicher | 2015-06-13 | 2 | -1/+11 |
| | |||||
* | Fix a few remaining references to the old Theme names/IDs | Robert Speicher | 2015-06-13 | 1 | -1/+1 |
| | |||||
* | Ensure `session_expire_delay` field exists before accessing itrs-issue-1798 | Robert Speicher | 2015-06-13 | 1 | -4/+4 |
| | | | | Closes #1798 | ||||
* | session_expire_seconds => session_expire_delay | themaze75 | 2015-06-10 | 3 | -6/+6 |
| | | | | | delay is in seconds more legible code in session_store Added `GitLab restart required` help block to session_expire_delay | ||||
* | Add session expiration delay configuration through UI application | Eric Maziade | 2015-06-05 | 2 | -1/+7 |
| | | | settings | ||||
* | Allow to configure a URL to show after sign out | Alex Lossent | 2015-05-29 | 2 | -1/+7 |
| | |||||
* | Add option to disallow users from registering any application to use GitLab ↵user-oauth-applications | Douwe Maan | 2015-05-29 | 2 | -1/+7 |
| | | | | as an OAuth provider | ||||
* | Merge branch 'rs-gems' into 'master' | Dmitriy Zaporozhets | 2015-05-26 | 7 | -14/+14 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Update ffaker gem Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`. Prior, if a new developer checked out the repo, ran `bundle install` and then tried `rake dev:setup`, seeding would fail due to having the latest version of ffaker without the API changes in this MR. Also updates `spring` version and the binstubs, just for kicks. See merge request !686 | ||||
| * | Update ffaker gem | Robert Speicher | 2015-05-20 | 7 | -14/+14 |
| | | | | | | | | | | | | Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`. | ||||
* | | Add support for Webhook note events | Stan Hu | 2015-05-21 | 2 | -1/+11 |
|/ | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/6745 | ||||
* | Make more migrations reversiblers-reversable-migrations | Robert Speicher | 2015-05-13 | 3 | -3/+22 |
| | | | | [ci skip] | ||||
* | Merge branch 'version-check' into 'master' | Dmitriy Zaporozhets | 2015-05-13 | 2 | -0/+6 |
|\ | | | | | | | | | | | Version check See merge request !1509 | ||||
| * | Merge branch 'version-check' into gl-version-check | Dmitriy Zaporozhets | 2015-05-08 | 2 | -0/+6 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb | ||||
| | * | Add feature to disable version check | Dmitriy Zaporozhets | 2015-03-10 | 2 | -1/+7 |
| | | |