summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 remote-tracking branch 'origin/master' into improve-pipeline-processingKamil Trzcinski2016-08-1231-208/+362
|\ \ | |/
| * 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
| | | |
| | * | remove need for schedulesernstvn2016-04-121-5/+9
| | | |
| * | | Merge branch '20614-show-member-roles-to-all-users' into 'master' Robert Speicher2016-08-116-84/+2
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Show member roles to all users on members page Closes #20614 and https://gitlab.com/gitlab-org/gitlab-ee/issues/850 See merge request !5776
| | * | Show member roles to all users on members page20614-show-member-roles-to-all-usersDouwe Maan2016-08-116-84/+2
| | | |
| * | | Merge branch '15000-rename-markdown-preview' into 'master' Robert Speicher2016-08-118-14/+15
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Rename `markdown_preview` routes to `preview_markdown` _Originally opened at !3700 by @cbartz._ Closes #15000. See merge request !5774
| | * | Rename `markdown_preview` routes to `preview_markdown`Christopher Bartz2016-08-118-14/+15
| | | |
* | | | 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 'remove-grack-lfs' into 'master' Rémy Coutable2016-08-1112-716/+433
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Grack::Auth: part 2 (LFS) Deprecate Grack::Auth and handle LFS in Rails controllers under the Project namespace. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14501 See merge request !5369
| * | | Fix typoJacob Vosmaer2016-08-111-1/+1
| | | |
| * | | Improve validation of X-Gitlab-Lfs-Tmp headerJacob Vosmaer2016-08-102-9/+17
| | | |
| * | | Use && and || instead of ifJacob Vosmaer2016-08-101-12/+3
| | | |
| * | | Rename lfs_enabled helper methodJacob Vosmaer2016-08-103-3/+3
| | | |
| * | | Remove duplicate method reintroduced by mergeJacob Vosmaer2016-08-091-4/+0
| | | |
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-08-09905-17535/+25477
| |\ \ \ | | | | | | | | | | | | | | | remove-grack-lfs
| * | | | Handle custom Git LFS content typeJacob Vosmaer2016-07-222-5/+12
| | | | |
| * | | | RubocopJacob Vosmaer2016-07-222-8/+8
| | | | |
| * | | | Better cache when modifying in-placeJacob Vosmaer2016-07-221-1/+1
| | | | |
| * | | | Remove obsolete codeJacob Vosmaer2016-07-225-594/+1
| | | | |
| * | | | Add LFS controllersJacob Vosmaer2016-07-227-116/+420
| | | | |
* | | | | Merge branch 'refactor-builds-creation-service' into 'master' Rémy Coutable2016-08-1147-966/+1042
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor pipeline creation service ## What does this MR do? This refactors GitLab CI build processing: all builds for pipeline are pre-created when a pipeline object is created. The builds are created with a new introduced status `created`. The builds are then automatically promoted to `pending` when a previous stage do succeed. This significantly simplifies pipeline processing code solving a lot of problems of lazily initialisation of previous approach (builds were created on-demand). ## Why was this MR needed? The previous mechanism had a lot of flows (shown in related issues) in how it work, but also in code design. Removing cross model-service-library dependencies. The current approach moves a build creation to single place `CreatePipelineService` and removes a dynamic dependency on `config_processor` significantly simplifying a build creation and pipeline processing. Pipeline processing is implemented in `ProcessPipelineService`. This also allows to easily extend GitLab with Manual Actions which is part of 8.10 direction issue. ## Migration problem ~~This MR removes the a on-demand creation of builds in pipelines. Pipelines that are running and are in mid-stage (some stages started, but not all) will not be fully evaluated after application restart. This happens, because the code responsible for on-demand creation is removed. There's no easy way to migrate existing pipelines, other than doing offline migration and putting pipeline processing in migration code (which seems to be a really bad idea).~~ To support old pipelines I added a lazy initialization of builds if none is found. ## What are the relevant issue numbers? Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/12839 Solves: https://gitlab.com/gitlab-org/gitlab-ce/issues/18644 https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/289 Allows to easily implement: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010 ## Does this MR meet the acceptance criteria? - [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] API support added - Tests - [x] Added for this feature/bug - [ ] 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 !5295
| * | | | Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-1147-966/+1042
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change simplifies a Pipeline processing by introducing a special new status: created. This status is used for all builds that are created for a pipeline. We are then processing next stages and queueing some of the builds (created -> pending) or skipping them (created -> skipped). This makes it possible to simplify and solve a few ordering problems with how previously builds were scheduled. This also allows us to visualise a full pipeline (with created builds). This also removes an after_touch used for updating a pipeline state parameters. Right now in various places we explicitly call a reload_status! on pipeline to force it to be updated and saved.
* | | | | Merge branch '10772-fix-urlencoded-branchname' into 'master' Rémy Coutable2016-08-113-4/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix front-end for branches that happen to contain urlencoding escape characters (e.g. %) _Originally opened at !3574 by @ewiltshi._ - - - Adding a branch with a name like "foo%20bar" (via command-line) and setting it to the project's default branch causes the project "show" page to 404 for that project. "assign_ref_vars" unescapes the branch name ("foo%20bar" ==> "foo bar"), making GitLab look for a non-existent branch. This MR adds logic to skip the URL unescaping step in "assign_ref_vars". Fixes #10772, #14992, #15304. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] 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 !5770
| * | | | | Fix front-end for branches that happen to contain urlencoding escape ↵10772-fix-urlencoded-branchnameElliot2016-08-113-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | characters (e.g. %) Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'file_exists_deprecated' into 'master' Rémy Coutable2016-08-118-19/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `File::exist?` instead of `File::exists?` Each `File::exists?` replaced to `File::exist?`. Since version ruby-2.2.0, method `File::exists?` is deprecated. See merge request !5747
View Lorry Controller Status