| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-10-05 | 1 | -2/+1 |
| |\ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Merge branch 'rs-remove-ci-disable' | Kamil Trzcinski | 2015-10-05 | 1 | -2/+1 |
| | |\ | | | | | | | | | | See merge request !1512 | ||||
| | | * | Remove the option to disable CIrs-remove-ci-disable | Robert Speicher | 2015-10-05 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | 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 Zaporozhets | 2015-10-05 | 1 | -1/+2 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | added user preference to change layout width | Peter Göbel | 2015-10-05 | 1 | -1/+2 |
| | |/ | |||||
| * | | Fix db/schema.rb | Kamil Trzcinski | 2015-10-05 | 1 | -58/+36 |
| | | | |||||
| * | | Make commit_spec run | Kamil Trzcinski | 2015-10-05 | 1 | -37/+64 |
| |/ | |||||
| * | Update db schema | Dmitriy Zaporozhets | 2015-10-01 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Improve error message when merging failsmr_improve_errors_handling | Valery Sizov | 2015-10-01 | 1 | -1/+2 |
| | | |||||
| * | Delegate ci_project parameters to projects | Kamil Trzcinski | 2015-09-30 | 1 | -2/+2 |
| | | | | | | | | - 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 migrations | Kamil Trzcinski | 2015-09-29 | 1 | -17/+9 |
| | | |||||
| * | Fix db/schema.rb | Kamil Trzcinski | 2015-09-29 | 1 | -26/+29 |
| | | |||||
| * | WIP | Kamil Trzcinski | 2015-09-29 | 1 | -37/+43 |
| | | |||||
| * | Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diff | Douwe Maan | 2015-09-20 | 1 | -1/+2 |
| | | |||||
| * | Bump devise-two-factor to 2.0.0rs-bump-two-factor | Robert Speicher | 2015-09-19 | 1 | -1/+2 |
| | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43 | ||||
| * | Allow to disable GitLab CI | Kamil Trzcinski | 2015-09-18 | 1 | -1/+2 |
| | | |||||
| * | Allow custom info to be added to Help page | Jeroen van Baarsen | 2015-09-18 | 1 | -0/+1 |
| | | | | | | | 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 | 1 | -3/+2 |
| | | |||||
| * | Fix ordering issue | Kamil Trzcinski | 2015-09-16 | 1 | -1/+2 |
| | | |||||
| * | Add rake task to migrate CI tags | Kamil Trzcinski | 2015-09-15 | 1 | -1/+21 |
| | | |||||
| * | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g | Dmitriy Zaporozhets | 2015-09-09 | 1 | -1/+2 |
| |\ | |||||
| | * | added spinach for glabal labelsglobal_labels | Valery Sizov | 2015-09-03 | 1 | -120/+37 |
| | | | |||||
| | * | CRUD for admin labels | Valery Sizov | 2015-09-03 | 1 | -38/+122 |
| | | | |||||
| | * | Update db schema | Dmitriy Zaporozhets | 2015-09-01 | 1 | -22/+22 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | 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 | 1 | -7/+7 |
| |\ \ | |/ | |||||
| | * | Enable SSL verification for Webhooksenable_ssl_verification_web_hook | Valery Sizov | 2015-08-26 | 1 | -7/+8 |
| | | | |||||
| * | | Groundwork for merging CI into CE | Douwe Maan | 2015-08-25 | 1 | -39/+295 |
| |/ | |||||
| * | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab | Stan Hu | 2015-08-23 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+1 |
| |\ | |||||
| | * | Import sources: settings in the admin interface | Artem Sidorenko | 2015-08-20 | 1 | -1/+2 |
| | | | |||||
| * | | Reply by email POC | Douwe Maan | 2015-08-18 | 1 | -1/+12 |
| |/ | |||||
| * | Merge branch 'master' into comment-updated-bycomment-updated-by | Douwe Maan | 2015-08-07 | 1 | -1/+9 |
| |\ | |||||
| | * | Allow users to send abuse reports | Dmitriy Zaporozhets | 2015-08-06 | 1 | -1/+9 |
| | | | | | | | | | 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 | 1 | -2/+5 |
| |/ | |||||
| * | Store commit count in project tableadvanced-cache | Dmitriy Zaporozhets | 2015-07-17 | 1 | -1/+2 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Allow user to specify content he wants to see on project pageproject-default-view | Dmitriy Zaporozhets | 2015-07-13 | 1 | -1/+2 |
| | | | | | 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 | 1 | -2/+16 |
| | | |||||
| * | Make default value for otp_required_for_login false instead of null | Robert Speicher | 2015-06-20 | 1 | -2/+2 |
| | | |||||
| * | Add `dashboard` attribute to User model | Robert Speicher | 2015-06-13 | 1 | -1/+2 |
| | | |||||
| * | 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 | 1 | -1/+1 |
| | | | | | | 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 | 1 | -1/+2 |
| | | | | settings | ||||
| * | Allow to configure a URL to show after sign out | Alex Lossent | 2015-05-29 | 1 | -1/+2 |
| | | |||||
| * | Add option to disallow users from registering any application to use GitLab ↵user-oauth-applications | Douwe Maan | 2015-05-29 | 1 | -1/+2 |
| | | | | | as an OAuth provider | ||||
| * | Add support for Webhook note events | Stan Hu | 2015-05-21 | 1 | -1/+2 |
| | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/6745 | ||||
| * | Merge branch 'version-check' into 'master' | Dmitriy Zaporozhets | 2015-05-13 | 1 | -0/+1 |
| |\ | | | | | | | | | | | Version check See merge request !1509 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |