summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Fix review commentsci-predefined-variablesKamil Trzcinski2016-07-201-1/+4
|
* Improve implementation of variablesKamil Trzcinski2016-07-205-55/+72
|
* Update all exposed variables to CI buildsKamil Trzcinski2016-07-201-6/+17
|
* Merge remote-tracking branch 'origin/master' into ci-predefined-variablesKamil Trzcinski2016-07-1955-548/+1289
|\
| * Ensure Owners are included in the scope for authorized_projectsRobert Speicher2016-07-191-1/+1
| | | | | | | | | | | | | | | | Prior, when providing a `min_access_level` parameter to this method, we called `Gitlab::Access.values` instead of `all_values`, mistakenly omitting the `OWNER` level. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19878
| * Merge branch 'rename-repo-files' into 'master' Douwe Maan2016-07-191-0/+27
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the form for renaming the new filename on the file edit page ## What does this MR do? Adds the possibility to edit a filename when editing the content of a file on Gitlab this MR was made to solve #5850 ![Screen_Shot_2016-07-01_at_16.45.53](/uploads/eeed05800e3dc11f1e3840e0e4fa06b5/Screen_Shot_2016-07-01_at_16.45.53.png) See merge request !5049
| | * fixes an issue cause by a bad mergetiagonbotelho2016-07-191-1/+2
| | |
| | * Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-197-49/+94
| | |\
| | * \ Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-1812-50/+59
| | |\ \
| | * | | fixes more issues for MR acceptancetiagonbotelho2016-07-121-8/+8
| | | | |
| | * | | fixes issues for mr acceptancetiagonbotelho2016-07-121-1/+0
| | | | |
| | * | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-0/+1
| | | | |
| | * | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-1/+0
| | | | |
| | * | | fixes issues for mr acceptancetiagonbotelho2016-07-121-0/+1
| | | | |
| | * | | refactors to pass values as arguments through optionstiagonbotelho2016-07-121-25/+8
| | | | |
| | * | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-0/+16
| | | | |
| | * | | fixes more issues for MR acceptancetiagonbotelho2016-07-121-12/+12
| | | | |
| | * | | fixes issues for mr acceptancetiagonbotelho2016-07-121-2/+2
| | | | |
| | * | | refactors to pass values as arguments through optionstiagonbotelho2016-07-121-2/+2
| | | | |
| | * | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-2/+2
| | | | |
| | * | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-1/+0
| | | | |
| | * | | fixes issues for mr acceptancetiagonbotelho2016-07-121-1/+1
| | | | |
| | * | | refactors to pass values as arguments through optionstiagonbotelho2016-07-121-13/+14
| | | | |
| | * | | removes debugging prints from codetiagonbotelho2016-07-121-3/+0
| | | | |
| | * | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-3/+0
| | | | |
| | * | | refactors blob_controllertiagonbotelho2016-07-121-10/+13
| | | | |
| | * | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-0/+30
| | | | |
| * | | | Improve code designKamil Trzcinski2016-07-191-0/+1
| | | | |
| * | | | Use value of `yaml_variables` and `when` from config_processor if undefinedKamil Trzcinski2016-07-191-6/+14
| | | | |
| * | | | Merge branch 'manual-actions' into 'master' Rémy Coutable2016-07-195-3/+39
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for manual CI actions ## What does this MR do? This implements a `when: manual` which allows a jobs to be marked as manual actions. Manual actions have to be explicitly executed by developers. ## What are the relevant issue numbers? This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010 See merge request !5297
| | * | | Make manual actions to work with master codeKamil Trzcinski2016-07-182-1/+5
| | | | |
| | * | | Mark builds with manual actions as skippedKamil Trzcinski2016-07-181-3/+3
| | | | |
| | * | | Fix rubocop offensesKamil Trzcinski2016-07-181-2/+2
| | | | |
| | * | | Improve manual actions code and add model, service and feature testsKamil Trzcinski2016-07-182-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual actions are accessible from: - Pipelines - Builds - Environments - Deployments
| | * | | Rename playable_actions to manual_actionsKamil Trzcinski2016-07-183-8/+4
| | | | |
| | * | | Add implementation of manual actionsKamil Trzcinski2016-07-183-0/+32
| | | |/ | | |/|
| * | | Squashed - fix encoding issuefix/import-export-encodingJames Lopez2016-07-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WIP - trying to replicate UTF-8 error fix spec fixing encoding issue and another spec, to do with MR diffs fix issue and spec failure Add changelog and bumped up I/E version fix spec based on feedback - omitted target project
| * | | Fix of 'Commits being passed to custom hooks are already reachable when ↵Valery Sizov2016-07-191-44/+28
| | | | | | | | | | | | | | | | using the UI'
| * | | Merge branch 'issue_13343' into 'master' Robert Speicher2016-07-182-0/+36
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow build email service to be tested Fixes #13343 See merge request !5223
| | * | | Allow build email service to be testedissue_13343Felipe Artur2016-07-152-0/+36
| | | | |
| * | | | Merge branch '19420-render-only-commit-title' into 'master' 19889-shortcuts-modal-is-brokenDouwe Maan2016-07-181-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render only commit title ## What does this MR do? Render only commit title in builds ## Why was this MR needed? Better readability ## What are the relevant issue numbers? Closes #19420 ## Screenshots (if relevant) ![after](/uploads/fcdd59d74a0f91f6ac847f7f02d5f07f/after.png)![before](/uploads/71ca6dabf31452a1a8dfb15ecb8860c5/before.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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) cc: @kradydal @yorickpeterse @grzesiek @tmaczukin @dzaporozhets [@tomash](https://github.com/tomash) [@chastell](https://github.com/chastell) this is connected to closed MR [!5109](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5109) See merge request !5131
| | * | | | add git-commit-title-method into pipeline model and modify viewubudzisz2016-07-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | add git-commit-title-method into tests
| * | | | | Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-183-7/+19
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'"" ## What does this MR do? Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564. ## What are the relevant issue numbers? Closes #19872. See merge request !5310
| | * | | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-183-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵store-variables-and-when-in-builds-tableKamil Trzcinski2016-07-1811-23/+31
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | store-variables-and-when-in-builds-table # Conflicts: # db/schema.rb
| | * | | | Merge branch 'track-pipeline-user' into 'master' Rémy Coutable2016-07-183-2/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track a user who creates a Pipeline ## What does this MR do? This adds additional column to pipelines to track user who is creating pipelines. ## Why was this MR needed? This is to make it possible to show all pipelines created by specific user and to later solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/18054 ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18992 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5272
| | | * | | | Track a user who created a pipelineKamil Trzcinski2016-07-153-2/+5
| | | | | | |
| | * | | | | Merge branch 'fix-deployment-creation-on-build-retry' into 'master' Rémy Coutable2016-07-181-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix creation of deployment on build that is retried, redeployed or rollback ## What does this MR do? Add missing `environment` to be copied when retrying a build. ## Why was this MR needed? The retried builds did not create a deployments. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19521 - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5275
| | | * | | | | Fix creation of deployment on build that is retried, redeployed or rollbackfix-deployment-creation-on-build-retryKamil Trzcinski2016-07-161-0/+1
| | | | | | | |
| | * | | | | | Merge branch 'allow-to-pull-public-images' into 'master' Rémy Coutable2016-07-181-1/+2
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to access Container Registry for Public and Internal projects ## What does this MR do? Adds missing ability `read_container_image` for `public scope` which affects users accessing public and internal projects. ## Why was this MR needed? Previously, we allowed to use container registry for anonymous users, but did not allow to do the same for logged in. This MR makes it possible. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18176 https://gitlab.com/gitlab-org/gitlab-ce/issues/19668 https://gitlab.com/gitlab-org/gitlab-ce/issues/19117 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5279
View Lorry Controller Status