summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Minor update on CI docs exampleszj-update-ci-examples-docZ.J. van de Weg2016-09-091-6/+8
| | | | | | | | | | Triggered by gitlab-org/gitlab-ci-yml#1 I've investigated how this is organized so far and did a minor clean up. In my opinion we should just keep a list of up to date blog posts in the docs and examples should be included in gitlab-org/gitlab-ci-yml. This reduces the number of projects and docs pages one has to look for information. [ci skip]
* Merge branch 'push-mr-url-guards' into 'master' Douwe Maan2016-08-122-1/+46
|\ | | | | | | | | | | | | Don't show new MR URL after push when it doesn't make sense See merge request !5786
| * Don't show new MR URL after push when it doesn't make senseDouwe Maan2016-08-122-1/+46
| |
* | Merge branch 'archived_project_badge' into 'master' Rémy Coutable2016-08-122-0/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add archived badge to project listing ## What does this MR do? Add an `archived` badge to the user project list, if the project is archived. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Customer noted in https://gitlab.zendesk.com/agent/tickets/33787 that there is no distinction for archived projects in the project dashboard/explore projects page. There is an archived badge on the admin projects page, though. ## What are the relevant issue numbers? ## Screenshots (if relevant) Existing admin projects page: ![Screen_Shot_2016-08-12_at_3.54.37_PM](/uploads/d6ba44c2d3be1f78372792b5ac406672/Screen_Shot_2016-08-12_at_3.54.37_PM.png) New project list with archived badge: ![Screen_Shot_2016-08-12_at_3.54.21_PM](/uploads/3fa8bb9fe7588575aace0761984929a7/Screen_Shot_2016-08-12_at_3.54.21_PM.png) See merge request !5798
| * Add archived badge to project listingDrew Blessing2016-08-122-0/+3
|/
* Merge branch 'fix-namespace-deletion' into 'master' Robert Speicher2016-08-1216-34/+179
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where destroying a namespace would not always destroy projects There is a race condition in DestroyGroupService now that projects are deleted asynchronously: 1. User attempts to delete group 2. DestroyGroupService iterates through all projects and schedules a Sidekiq job to delete each Project 3. DestroyGroupService destroys the Group, leaving all its projects without a namespace 4. Projects::DestroyService runs later but the can?(current_user, :remove_project) is `false` because the user no longer has permission to destroy projects with no namespace. 5. This leaves the project in pending_delete state with no namespace/group. Projects without a namespace or group also adds another problem: it's not possible to destroy the container registry tags, since `container_registry_path_with_namespace` is the wrong value. The fix is to destroy the group asynchronously and run `execute` directly on Projects::DestroyService. Closes #17893 See merge request !4341
| * Fix bug where destroying a namespace would not always destroy projectsStan Hu2016-08-1116-34/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a race condition in DestroyGroupService now that projects are deleted asynchronously: 1. User attempts to delete group 2. DestroyGroupService iterates through all projects and schedules a Sidekiq job to delete each Project 3. DestroyGroupService destroys the Group, leaving all its projects without a namespace 4. Projects::DestroyService runs later but the can?(current_user, :remove_project) is `false` because the user no longer has permission to destroy projects with no namespace. 5. This leaves the project in pending_delete state with no namespace/group. Projects without a namespace or group also adds another problem: it's not possible to destroy the container registry tags, since container_registry_path_with_namespace is the wrong value. The fix is to destroy the group asynchronously and to run execute directly on Projects::DestroyService. Closes #17893
* | Merge branch 'ruby-2-3-1' into 'master' Douwe Maan2016-08-121-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Update ruby 2.3.1 We where using 2.3.0, now 2.3.1 cc @connorshea See merge request !5790
| * | Update ruby 2.3.1ruby-2-3-1Z.J. van de Weg2016-08-121-2/+2
| | |
* | | Merge branch '20059-environment-list' into 'master' Jacob Schatz2016-08-128-14/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Format branch, tag, and commit in environment list" ## What does this MR do? Updates Environments page rows to match the new pipeline updates ## Are there points in the code the reviewer needs to double check? I removed `private` from `avatars_helper.rb` so I could use `user_avatar`. ## What are the relevant issue numbers? Closes #20059 ## Screenshots (if relevant) ![Screen_Shot_2016-08-08_at_11.44.36_AM](/uploads/62fbb475a7d9cc613fe5ba1715229553/Screen_Shot_2016-08-08_at_11.44.36_AM.png) ![Screen_Shot_2016-08-08_at_11.44.41_AM](/uploads/ce1bd3ab62c0bc8091e9b6f85012ed36/Screen_Shot_2016-08-08_at_11.44.41_AM.png) See merge request !5687
| * | | Add gravatars to build history20059-environment-listAnnabel Dunstone2016-08-083-3/+4
| | | |
| * | | Add deployment ID and gravatar to environments pageAnnabel Dunstone2016-08-083-4/+8
| | | |
| * | | Format environment history pageAnnabel Dunstone2016-08-081-2/+2
| | | |
| * | | Add avatar to commit message; environment style updates to match pipelines pageAnnabel Dunstone2016-08-085-9/+25
| | | |
| * | | Style deploy buttonAnnabel Dunstone2016-08-082-3/+20
| | | |
* | | | Merge branch 'instrument-project-visible-to-user' into 'master' Rémy Coutable2016-08-122-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instrument Project.visible_to_user ## What does this MR do? This MR instruments `Project.visible_to_user` ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? The method in question was not instrumented due to being a Rails scope. ## What are the relevant issue numbers? #12425 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5793
| * | | | Instrument Project.visible_to_userYorick Peterse2016-08-122-0/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | Because this method is a Rails scope we have to instrument it manually as regular the instrumentation methods only instrument methods defined directly on a Class or Module.
* | | | Merge branch 'improve-pipeline-processing' into 'master' Rémy Coutable2016-08-1212-113/+214
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve pipeline processing ## What does this MR do? This works on top of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5295 trying to solve some edge cases introduced by that Merge Request. The fix switches to a state machine which is already a part of `Ci::Pipeline` and uses events with conditional transitions to switch between pipeline states. This is approach is much more bullet proof and much easier to understand than a previous one where we were calling a `reload_status!` which manually updated `status`. Previous approach become confusing and prone to number of errors. ## Why was this MR needed? This improves changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5295 ## What are the relevant issue numbers? None, yet. ## Screenshots (if relevant) Not needed. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added (not needed since changelog for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5295 is already introduced) - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added (not needed) - Tests - [x] Added for this feature/bug (most of tests do cover the triggering of Pipeline) - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5782
| * | | Fix build play failureimprove-pipeline-processingKamil Trzcinski2016-08-121-1/+1
| | | |
| * | | Improve transition between states for event `enqueue`Kamil Trzcinski2016-08-121-1/+1
| | | |
| * | | Use event `enqueue` instead of `queue`Kamil Trzcinski2016-08-126-23/+34
| | | |
| * | | Fix test failuresKamil Trzcinski2016-08-122-2/+2
| | | |
| * | | Added specs for started_at and finished_atKamil Trzcinski2016-08-122-15/+46
| | | |
| * | | Use explicit events to transition between statesKamil Trzcinski2016-08-122-13/+33
| | | |
| * | | Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-123-4/+30
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-1231-208/+362
| |\ \ \
| * | | | Fix test failures, that did occur because of missing previously used ↵Kamil Trzcinski2016-08-117-56/+60
| | | | | | | | | | | | | | | | | | | | `reload_status!` call
| * | | | Use state machine for pipeline event processingKamil Trzcinski2016-08-119-71/+54
| | | | |
| * | | | Verify the pipeline status after executing events on buildsKamil Trzcinski2016-08-113-1/+53
| | | | |
* | | | | Merge branch 'update-performance-guide' into 'master' Achilleas Pipinellis2016-08-121-5/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected links/usernames in performance guide ## What does this MR do? This fixes two broken links in the performance guide and removes the mention of Josh as he no longer works for GitLab. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? The guide contained two broken links, and Josh no longer works for GitLab. ## What are the relevant issue numbers? None. ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5772
| * | | | | Corrected links/usernames in performance guideupdate-performance-guideYorick Peterse2016-08-111-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes two broken links in the performance guide and removes the mention of Josh as he no longer works for GitLab. [ci skip]
* | | | | | Merge branch 'remove-unused-spam-report' into 'master' Robert Speicher2016-08-111-5/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Remove unused SpamReport model; this was renamed to SpamLog See merge request !5778
| * | | | | Remove unused SpamReport model; this was renamed to SpamLogremove-unused-spam-reportStan Hu2016-08-111-5/+0
| | | | | |
* | | | | | Merge branch '19725-new-pipeline-auto-completion' into 'master' Robert Speicher2016-08-113-4/+30
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "New pipeline auto-completion" ## What does this MR do? Add auto-completion to new pipeline. ## What are the relevant issue numbers? Closes #19725 See merge request !5389
| * | | | | Update CHANGELOGula budziszewska2016-08-111-1/+0
| | | | | |
| * | | | | render only commit titleubudzisz2016-08-113-3/+30
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update CHANGELOG add auto-completion into pipeline add auto-completion into pipeline add auto-completion into pipeline update changelog modify tests remove empty lines add auto-completion into pipeline update changelog modify tests switch text_field_tag into text_field add test to new field switch context into describe Update CHANGELOG render only commit title update CHANGELOG add auto-completion into pipeline add auto-completion into pipeline add auto-completion into pipeline update changelog modify tests remove empty lines add auto-completion into pipeline update changelog modify tests update changelog Update CHANGELOG add indetation add tests to pipeline ref change file name for tests change file name for spec tests remove empty line rename test it rename test name removing unexpected changes removing unexpected changes2 update changelog
* | | | | Merge branch 'gitlab-shell-3-3-3' into 'master' Douwe Maan2016-08-112-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-shell to v3.3.3 Finishing touch for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5542 ![](https://gitlab.com/gitlab-org/gitlab-shell/uploads/bd0d4864f7bd864d38bfb6798fdd4ea3/image.png) See merge request !5780
| * | | | | Update gitlab-shell to v3.3.3Douwe Maan2016-08-112-2/+2
| | | | | |
* | | | | | Merge branch 'rails-4-2-7-1' into 'master' Robert Speicher2016-08-112-32/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Rails to 4.2.7.1 for security fixes. Upgrades Rails from 4.2.7 to 4.2.7.1 for security fixes. For more information: http://weblog.rubyonrails.org/2016/8/11/Rails-5-0-0-1-4-2-7-2-and-3-2-22-3-have-been-released/ This should be backported to all currently-supported releases. See merge request !5781
| * | | | | Upgrade Rails to 4.2.7.1 for security fixes.Connor Shea2016-08-112-32/+32
|/ / / / / | | | | | | | | | | | | | | | More information available at: http://weblog.rubyonrails.org/2016/8/11/Rails-5-0-0-1-4-2-7-2-and-3-2-22-3-have-been-released/
* | | | | Merge branch 'feature/merge-request-link-after-push' into 'master' Douwe Maan2016-08-1111-23/+254
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request link after pushing ## What does this MR do? Add API to generate new merge request urls if it is a new branch. The API will be called by gitlab-shell ## What are the relevant issue numbers? #18266 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5542
| * | | | | api for generating new merge requestScott Le2016-08-1111-23/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DRY code + fix rubocop Add more test cases Append to changelog DRY changes list find_url service for merge_requests use GET for getting merge request links remove files rename to get_url_service reduce loop add test case for cross project refactor tiny thing update changelog
* | | | | | Merge branch 'ruby-2-3-lets-not-break-things' into 'master' Douwe Maan2016-08-114-48/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Ruby 2.3.1 ## What does this MR do? This WIP MR will eventually introduce 2.3 as default language for GitLab CE/EE ## Why was this MR needed? @connorshea wants to be prepared for Rails 5.0, so we need Ruby > 2.2, so why not go 2.3 already? ## What are the relevant issue numbers? Closes #12507 ## TODO - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] All builds are passing - [ ] [Omnibus uses 2.3.1](https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/847) See merge request !4948
| * | | | | | Target 8.11 for CHANGELOG entry Ruby 2.3Z.J. van de Weg2016-08-111-2/+1
| | | | | | |
| * | | | | | Update currently supported Ruby version info.Connor Shea2016-08-112-1/+3
| | | | | | |
| * | | | | | Update gitlab ci tests to test ruby 2.1 now tooZ.J. van de Weg2016-08-111-1/+1
| | | | | | |
| * | | | | | Update docs to reference Ruby 2.3.1Connor Shea2016-08-111-7/+6
| | | | | | |
| * | | | | | Default build tests ruby 2.3.1Z.J. van de Weg2016-08-112-41/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.1.8 is used only on master for now, as this would give confidance in case this commit has to be reverted.
* | | | | | | Merge branch 'remove-schedules' into 'master' Sid Sijbrandij2016-08-111-5/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove need for schedules Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/15156 \cc @pmachle , \cc @dusek See merge request !3685
| * | | | | | editremove-schedulesErnst van Nierop2016-04-131-1/+1
| | | | | | |