summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed variables_controller_spec.rb test26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pagesJose Ivan Vargas2017-02-061-2/+1
* Updated the #create action to render the show view in case of a form errorJose Ivan Vargas2017-02-061-2/+2
* Improved code styling on the variables_controller_specJose Ivan Vargas2017-02-063-12/+15
* Added tests for the variables controller #update actionJose Ivan Vargas2017-02-062-3/+29
* Added a variable_controller_spec test to test for flash messages on the #crea...Jose Ivan Vargas2017-02-062-0/+31
* Modified redirection logic in the variables cont.Jose Ivan Vargas2017-02-061-2/+3
* Added redirections to the index actions for the variables and triggers contro...Jose Ivan Vargas2017-02-062-0/+8
* Added a flash message to the creation of triggersJose Ivan Vargas2017-02-061-2/+3
* Fixed tests, renamed files and methodsJose Ivan Vargas2017-02-068-6/+28
* Changed the controller/route name to 'ci/cd' and renamed the corresponding filesJose Ivan Vargas2017-02-0613-34/+53
* Added private methods to initialize variables in the ci_cd_pipelines_controllerJose Ivan Vargas2017-02-062-5/+17
* Corrected titles on the triggers and pipelines sectionsJose Ivan Vargas2017-02-063-3/+3
* Corrected tests and changed trigger controller redirects to the ci_cd_pipelin...Jose Ivan Vargas2017-02-062-4/+3
* Removed options from the gear button in the projects and consolidated into oneJose Ivan Vargas2017-02-062-14/+22
* Fixed badges testJose Ivan Vargas2017-02-061-1/+1
* changed pipelines controller name to ci_cd_pipelinesJose Ivan Vargas2017-02-068-13/+13
* Converted the views to partials that compose the menu item "pipelines"Jose Ivan Vargas2017-02-0612-41/+58
* Merge branch 'fix-deleting-project-again' into 'master' Douwe Maan2017-02-063-24/+50
|\
| * Test both execute and async_executefix-deleting-project-againLin Jen-Shin2017-02-041-21/+29
| * Move the tests to spec/services/projects/destroy_service_spec.rbLin Jen-Shin2017-02-032-16/+10
| * Skip or retain project while deleting the project:Lin Jen-Shin2017-02-033-12/+36
* | Merge branch 'dont-delete-assigned-issuables' into 'master' Douwe Maan2017-02-063-4/+9
|\ \
| * | Update specDouwe Maan2017-02-061-2/+2
| * | Don't delete assigned MRs/issues when user is deletedDouwe Maan2017-02-062-2/+7
|/ /
* | Merge branch '27240-make-progress-bars-consistent' into 'master' Annabel Dunstone Gray2017-02-062-0/+6
|\ \
| * | 27240 Make progress bars consistent27240-make-progress-bars-consistenttauriedavis2017-02-032-0/+6
* | | Merge branch 'patch-12' into 'master' Achilleas Pipinellis2017-02-061-13/+13
|\ \ \
| * | | Fix markdown links in PROCESS.mdDavid2017-02-051-13/+13
* | | | Merge branch 'fix-references-header-parsing' into 'master' Sean McGivern2017-02-066-6/+95
|\ \ \ \
| * | | | No strong reasons to freeze themLin Jen-Shin2017-02-071-3/+2
| * | | | Freeze regexp and add a commentfix-references-header-parsingLin Jen-Shin2017-02-031-1/+3
| * | | | Use references variableLin Jen-Shin2017-02-031-1/+3
| * | | | Use message_id_regexp variable for the regexpLin Jen-Shin2017-02-031-1/+3
| * | | | Merge remote-tracking branch 'upstream/master' into fix-references-header-par...Lin Jen-Shin2017-02-031201-4982/+13081
| |\ \ \ \
| * | | | | Add changelog entryLin Jen-Shin2017-01-201-0/+5
| * | | | | Specify that iOS app would also do thisLin Jen-Shin2017-01-201-1/+3
| * | | | | Fix References header parser for Microsoft ExchangeLin Jen-Shin2017-01-205-6/+83
* | | | | | Merge branch 'remove-sidekiq-backup-ar-threads' into 'master' Douwe Maan2017-02-062-3/+5
|\ \ \ \ \ \
| * | | | | | Don't use backup AR connections for Sidekiqremove-sidekiq-backup-ar-threadsYorick Peterse2017-02-062-3/+5
* | | | | | | Merge branch 'issues-modal-filters' into 'master' Fatih Acet2017-02-0614-25/+695
|\ \ \ \ \ \ \
| * | | | | | | Fixed failing tests because list doens't existissues-modal-filtersPhil Hughes2017-02-061-0/+2
| * | | | | | | Fixed eslintPhil Hughes2017-02-062-4/+10
| * | | | | | | Merge branch 'master' into issues-modal-filtersPhil Hughes2017-02-06313-3214/+5124
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed milestone select failing testsPhil Hughes2017-02-031-1/+1
| * | | | | | | | Fixed eslint errorsPhil Hughes2017-02-036-8/+12
| * | | | | | | | Show empty state if filter returns empty resultsPhil Hughes2017-02-034-1/+37
| * | | | | | | | Resets modal filters when closingPhil Hughes2017-02-034-6/+42
| * | | | | | | | Added tests for modal filtersPhil Hughes2017-02-032-1/+220
| * | | | | | | | Passes through the correct endpointsPhil Hughes2017-02-036-6/+48
| * | | | | | | | Responsive styling fixes for the filtersPhil Hughes2017-02-031-2/+14