summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Dropdown implementationzj-gitignore-dropdownAlfredo Sumaran2016-05-2011-76/+97
|
* Update API and fetching taskZeger-Jan van de Weg2016-05-204-41/+51
|
* Dropdown implementationAlfredo Sumaran2016-05-207-20/+96
|
* First import of gitignoresZeger-Jan van de Weg2016-05-20181-5/+3780
| | | | | | Add .gitignore dropdown when creating a new .gitignore file Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
* Backend for a gitignores dropdownZeger-Jan van de Weg2016-05-2011-9/+227
|
* Merge branch 'issue-17537-fix' into 'master' Douwe Maan2016-05-203-4/+27
|\ | | | | | | | | | | | | Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref Closes #17537 See merge request !4151
| * Fix Error 500 when attempting to retrieve project license when HEAD points ↵Stan Hu2016-05-143-4/+27
| | | | | | | | | | | | to non-existent ref Closes #17537
* | Merge branch 'rs-issue-3055' into 'master' Douwe Maan2016-05-202-1/+7
|\ \ | | | | | | | | | | | | | | | | | | Use extended regexp flag for `git grep`-ing files Closes #3055 See merge request !4203
| * | Use extended regexp flag for `git grep`-ing filesrs-issue-3055Robert Speicher2016-05-182-1/+7
| | | | | | | | | | | | Closes #3055
* | | Merge branch 'fix/url-refactor-from-ee' into 'master' Robert Speicher2016-05-201-8/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update CE code to include some refactor done in EE to do with import url This is simply updating the code to match EE and avoid further conflicts related to `import_data` and `import_url` changes made on EE only. See merge request !4223
| * | | refactor project to include some nicer EE stufffix/url-refactor-from-eeJames Lopez2016-05-201-8/+3
| | | |
* | | | Merge branch 'update-db-schema' into 'master' Jeroen van Baarsen2016-05-201-3/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Updated the DB schema This updates `db/schema.rb` which apparently wasn't fully updated in the recent merge requests. See merge request !4222
| * | | Updated the DB schemaYorick Peterse2016-05-191-3/+4
|/ / /
* | | Merge branch 'feature/runner-config-untagged-jobs' into 'master' Robert Speicher2016-05-1922-98/+314
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add config for CI Runner that prevents it from picking untagged jobs Closes #3456 See merge request !4039
| * | | Use migration helper to prevent downtime migrationfeature/runner-config-untagged-jobsGrzegorz Bizon2016-05-191-8/+10
| | | |
| * | | Minor runner-related code refactoringsGrzegorz Bizon2016-05-194-21/+22
| | | |
| * | | Rename method that validates runner tag constrainsGrzegorz Bizon2016-05-191-2/+2
| | | |
| * | | Display validation errors when admin edits a runnerGrzegorz Bizon2016-05-192-11/+17
| | | |
| * | | Add minor corrections related to config of runnerGrzegorz Bizon2016-05-194-7/+6
| | | |
| * | | Improve setting default runner attrs when using APIGrzegorz Bizon2016-05-191-2/+5
| | | |
| * | | Move runner validator to separate private methodGrzegorz Bizon2016-05-191-6/+10
| | | |
| * | | Use form errors helper in CI runner edit formGrzegorz Bizon2016-05-191-4/+1
| | | |
| * | | Add not null constraint to run untagged runner optionGrzegorz Bizon2016-05-192-2/+2
| | | |
| * | | Set run untagged option when registering a runnerGrzegorz Bizon2016-05-192-12/+38
| | | |
| * | | Refactor CI API specs for creating runnerGrzegorz Bizon2016-05-191-17/+29
| | | |
| * | | Add docs for a new configuration setting for runnerGrzegorz Bizon2016-05-191-1/+7
| | | |
| * | | Extend runner options that are configurable via APIGrzegorz Bizon2016-05-193-5/+13
| | | |
| * | | Add Changelog entry for new runner configurationGrzegorz Bizon2016-05-191-0/+1
| | | |
| * | | Add method that check if build has tagsGrzegorz Bizon2016-05-192-3/+17
| | | |
| * | | Extend CI runners specsGrzegorz Bizon2016-05-191-1/+31
| | | |
| * | | Improve displaying validation messages for runnerGrzegorz Bizon2016-05-193-4/+13
| | | |
| * | | Update specs to be valid only for tagged runnerGrzegorz Bizon2016-05-191-9/+13
| | | |
| * | | Add custom validator to runner modelGrzegorz Bizon2016-05-192-1/+9
| | | |
| * | | Add CI API tests for runner config and untagged jobsGrzegorz Bizon2016-05-191-0/+32
| | | |
| * | | Disallow runner to pick untagged build if configuredGrzegorz Bizon2016-05-192-11/+31
| | | |
| * | | Extend runner config options for untagged jobsGrzegorz Bizon2016-05-195-35/+51
| | | |
| * | | Add form for runner config to run untagged jobsGrzegorz Bizon2016-05-191-0/+6
| | | |
| * | | Add runner db field for ability to run untagged jobsGrzegorz Bizon2016-05-192-0/+12
| | | |
* | | | Merge branch 'fix-ci-commit-creation' into 'master' Rémy Coutable2016-05-193-10/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios ## What does this MR do? If we use a new `project.ci_commits` it will add it to array, and some other services which can do a save on a project can lead to a scenario when `ci_commit` will be saved, where it should not be. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/support-forum/issues/717 https://gitlab.com/gitlab-com/support-forum/issues/715 https://gitlab.com/gitlab-org/gitlab-ce/issues/17596 https://gitlab.com/gitlab-com/support-forum/issues/714 https://gitlab.com/gitlab-org/gitlab-ce/issues/13402 cc @rymai See merge request !4214
| * | | | Fix creation of Ci::Commit object which can lead to pending, failed in some ↵Kamil Trzcinski2016-05-193-10/+24
| | | | | | | | | | | | | | | | | | | | scenarios
* | | | | Merge branch 'fix-generator-templates-directory' into 'master' Jeroen van Baarsen2016-05-194-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move generator templates to generator_templates/ See merge request !4217
| * | | | | Updated Rubocop for generator_templates/fix-generator-templates-directoryYorick Peterse2016-05-191-1/+1
| | | | | |
| * | | | | Move generator templates to generator_templates/Yorick Peterse2016-05-193-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we eager load everything in lib/ putting ERB code in .rb files will result in syntax errors. By moving the templates to ./generator_templates we can work around this.
* | | | | | Merge branch 'create-todo-on-failing-build' into 'master' Douwe Maan2016-05-1915-33/+237
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a todo on failing MR build Implements #14067. I worked on this with @DouweM (any mistakes are mine). When a build fails for a commit, create a todo for the author of the merge request that commit is the HEAD of. If the commit isn't the HEAD commit of any MR, don't do anything. If there already is a todo for that user and MR, don't do anything. Current limitations: - This isn't configurable by project. - The author of a merge request might not be the person who pushed the breaking commit. - I haven't tested this with a working CI setup, just with the unit tests below and by modifying my DB directly. See merge request !3177
| * | | | | | Create a todo on failing MR buildSean McGivern2016-05-1715-33/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a build fails for a commit, create a todo for the author of the merge request that commit is the HEAD of. If the commit isn't the HEAD commit of any MR, don't do anything. If there already is a todo for that user and MR, don't do anything. Current limitations: - This isn't configurable by project. - The author of a merge request might not be the person who pushed the breaking commit.
* | | | | | | Merge branch '17464-backport-email-syntax-highlighting' into 'master' Douwe Maan2016-05-1913-63/+135
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syntax-highlight diffs in push emails ![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png) Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !4147
| * | | | | | | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlightingSean McGivern2016-05-1713-63/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
* | | | | | | | Merge branch 'fix/after-script-documentation-update' into 'master' Jeroen van Baarsen2016-05-191-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 'after_script' introduction note Related to gitlab-org/gitlab-ci-multi-runner#1321 See merge request !4205
| * | | | | | | | Update 'after_script' introduction notefix/after-script-documentation-updateTomasz Maczukin2016-05-181-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'with-pipeline-view' into 'master' Douwe Maan2016-05-1932-100/+671
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pipeline view This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653 cc @DouweM @grzesiek Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625 See merge request !3703
View Lorry Controller Status