summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Truncate the DB in after(:all) test for ↵rc/backport-ee-fixRémy Coutable2017-02-172-5/+5
| | | | | | Gitlab::ImportExport::ProjectTreeRestorer Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'gfm-autocomplete-fixes' into 'master' Alfredo Sumaran2017-02-173-2/+63
|\ | | | | | | | | Fix errors in GFM slash commands matcher See merge request !8975
| * Fixes errors in GFM slash commands matcher and add tests for default matcherYarNayar2017-02-173-2/+63
| | | | | | | | See !8975
* | Merge branch '28339-npm-jqueryui-ssh' into 'master' Clement Ho2017-02-172-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Use http to fetch jQuery-ui dependency instead of ssh Closes #28339 See merge request !9331
| * | update yarn resolution for jquery-uiMike Greiling2017-02-171-1/+1
| | |
| * | Update lock file28339-npm-jqueryui-sshFilipa Lacerda2017-02-171-1/+1
| | |
| * | use http to feth jquery-ui dependency instead of sshFilipa Lacerda2017-02-171-1/+1
| | |
* | | Merge branch 'zero-for-unlimited' into 'master' Annabel Dunstone Gray2017-02-171-2/+2
|\ \ \ | | | | | | | | | | | | | | | | changed minor inconsistency in help text See merge request !9333
| * | | changed minor inconsistency in help textzero-for-unlimiteddimitrieh2017-02-171-2/+2
| | | |
* | | | Merge branch 'patch-14' into 'master'Rémy Coutable2017-02-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update gitlab_flow.md. Insert missing word on line 70. See merge request !9334
| * | | | Update gitlab_flow.mdMark Bowman2017-02-171-1/+1
| | | | |
* | | | | Merge branch 'dynamic-project-title-fixture' into 'master' Clement Ho2017-02-173-31/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for project_title_spec.js See merge request !9175
| * | | | | Replace static fixture for project_title_spec.js (!9175)winniehell2017-02-133-31/+12
| | | | | |
* | | | | | Merge branch 'document-ce-to-ee' into 'master' Robert Speicher2017-02-172-17/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document better the CE -> EE merge See merge request !9313
| * | | | | | Document better the CE -> EE mergedocument-ce-to-eeRémy Coutable2017-02-162-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'fix/gb/pipeline-retry-builds-started' into 'master' Kamil Trzciński2017-02-1720-89/+529
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make pipeline retry take stages order into account Closes #27431, #23710, and #26551 See merge request !9021
| * | | | | | | Remove support for locking in pipeline retry serviceGrzegorz Bizon2017-02-171-9/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into fix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-17638-6855/+13861
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (313 commits) Allow slashes in slash command arguments Add API endpoint to get all milestone merge requests remove trailing comma Restore pagination to admin abuse reports replace deprecated NoErrorsPlugin with NoEmitOnErrorsPlugin only compress assets in production Reduce number of pipelines created to test pagination add CHANGELOG.md entry for !8761 prevent diff unfolding link from appearing for deleted files fix build failures only show diff unfolding link if there are more lines to show fix typo in node section Only yield valid references in ReferenceFilter.references_in Cache js selectors; fix css move "Install node modules" step before "Migrate DB" within update process Renders pagination again for pipelines table update migration docs for 8.17 to include minimum node version Add CHANGELOG file Fix positioning of top scroll button Remove comments in migration ...
| * | | | | | | | Make build clone/retry implementation more robustfix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-164-36/+53
| | | | | | | | |
| * | | | | | | | Add test for cloning attributes when retrying a buildGrzegorz Bizon2017-02-151-0/+32
| | | | | | | | |
| * | | | | | | | When retrying a build copy a coverage regex settingGrzegorz Bizon2017-02-151-0/+1
| | | | | | | | |
| * | | | | | | | Prefer using `project.add_developer` in specsGrzegorz Bizon2017-02-155-9/+9
| | | | | | | | |
| * | | | | | | | Close all pipeline todos at once when retrying itGrzegorz Bizon2017-02-153-1/+18
| | | | | | | | |
| * | | | | | | | Make it possible to resolve all todos for pipelineGrzegorz Bizon2017-02-152-1/+30
| | | | | | | | |
| * | | | | | | | Add Changelog entry for CI/CD pipeline retry fixGrzegorz Bizon2017-02-141-0/+4
| | | | | | | | |
| * | | | | | | | Add specs for after_stage scope, update specs fileGrzegorz Bizon2017-02-141-4/+18
| | | | | | | | |
| * | | | | | | | Extend specs for build and pipeline retry servicesGrzegorz Bizon2017-02-142-16/+87
| | | | | | | | |
| * | | | | | | | Avoid race condition in build retry serviceGrzegorz Bizon2017-02-141-3/+2
| | | | | | | | |
| * | | | | | | | Simplify implementation of build retry serviceGrzegorz Bizon2017-02-141-8/+2
| | | | | | | | |
| * | | | | | | | Revert adding new methods in CI/CD stage classGrzegorz Bizon2017-02-141-12/+0
| | | | | | | | |
| * | | | | | | | Simplify implementation of pipeline retry serviceGrzegorz Bizon2017-02-144-60/+41
| | | | | | | | |
| * | | | | | | | Use new pipeline retry service with optimistic lockingGrzegorz Bizon2017-02-143-27/+39
| | | | | | | | |
| * | | | | | | | Add after_stage scope to commit status classGrzegorz Bizon2017-02-143-12/+10
| | | | | | | | |
| * | | | | | | | Reuse `Gitlab::Allowable` mixin in base serviceGrzegorz Bizon2017-02-141-4/+1
| | | | | | | | |
| * | | | | | | | Preserve base service abstraction for retry servicesGrzegorz Bizon2017-02-145-61/+62
| | | | | | | | |
| * | | | | | | | Fix Rubocop offense in pipeline retry serviceGrzegorz Bizon2017-02-131-1/+0
| | | | | | | | |
| * | | | | | | | Implement new pipeline retry serviceGrzegorz Bizon2017-02-134-11/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new service takes stages order into account.
| * | | | | | | | Add a separate CI/CD pipeline retry service classGrzegorz Bizon2017-02-133-1/+73
| | | | | | | | |
| * | | | | | | | Fix envs and deploys specs related to build retryGrzegorz Bizon2017-02-132-2/+6
| | | | | | | | |
| * | | | | | | | Fix pipeline processing specs after adding ability checksGrzegorz Bizon2017-02-131-3/+11
| | | | | | | | |
| * | | | | | | | Fix pipeline specs after adding retry ability checkGrzegorz Bizon2017-02-131-8/+16
| | | | | | | | |
| * | | | | | | | Fix CI build specs after adding retry ability checkGrzegorz Bizon2017-02-133-22/+34
| | | | | | | | |
| * | | | | | | | Add specs for build retry serviceGrzegorz Bizon2017-02-132-0/+62
| | | | | | | | |
| * | | | | | | | Extract CI/CD build retry code to separate serviceGrzegorz Bizon2017-02-132-26/+44
| | | | | | | | |
| * | | | | | | | Extend specs for canceling a running pipelineGrzegorz Bizon2017-02-131-2/+15
| | | | | | | | |
| * | | | | | | | Skip job only when canceling the pipeline it belongs toGrzegorz Bizon2017-02-133-4/+12
| | | | | | | | |
| * | | | | | | | Fix pipeline specs related to canceling buildsGrzegorz Bizon2017-02-132-3/+11
| | | | | | | | |
| * | | | | | | | Skip buils that were canceled but not started yetGrzegorz Bizon2017-02-131-1/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'task_list_refactor' into 'master' Fatih Acet2017-02-178-102/+80
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move task_list setup and events to own class See merge request !9016
| * \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactortask_list_refactorSimon Knox2017-02-16290-3237/+7515
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status