summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-create-nested-groups-via-ui' into 'master' Dmitriy Zaporozhets2017-02-091-11/+22
|\
| * Allow creating nested group via UIdz-create-nested-groups-via-uiDmitriy Zaporozhets2017-02-071-11/+22
* | Merge branch 'dz-refactor-full-path' into 'master' Dmitriy Zaporozhets2017-02-083-4/+4
|\ \
| * | Store group and project full name and full path in routes tabledz-refactor-full-pathDmitriy Zaporozhets2017-02-083-4/+4
* | | Merge branch 'rename_delete_services' into 'master'Rémy Coutable2017-02-084-4/+4
|\ \ \
| * | | Fix inconsistent naming for services that delete thingsdixpac2017-02-084-4/+4
* | | | Merge branch 'lfs-noauth-public-repo' into 'master'Rémy Coutable2017-02-081-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | lfs: do not require auth for public repositoriesBen Boeckel2017-02-071-0/+4
* | | | Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master' Fatih Acet2017-02-071-2/+4
|\ \ \ \
| * | | | Fix rendering pipelines for a new merge requestGrzegorz Bizon2017-02-071-2/+4
| | |/ / | |/| |
* | | | Merge branch 'route-map' into 'master' Robert Speicher2017-02-075-5/+14
|\ \ \ \
| * | | | Address feedbackDouwe Maan2017-02-064-16/+9
| * | | | Add feature specsDouwe Maan2017-02-062-4/+4
| * | | | Improve performance of finding last deployed environmentDouwe Maan2017-02-065-6/+6
| * | | | Add 'View on [env]' link to blobs and individual files in diffsDouwe Maan2017-02-064-1/+17
* | | | | Merge branch '24147-delete-env-button' into 'master' Rémy Coutable2017-02-072-4/+9
|\ \ \ \ \
| * | | | | Fix stoppable?Kamil Trzcinski2017-02-071-1/+1
| * | | | | Update changesKamil Trzcinski2017-02-062-2/+3
| * | | | | Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-02-0626-73/+154
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 24147-delete-env-buttonKamil Trzcinski2017-01-2484-553/+1216
| |\ \ \ \ \ \
| * | | | | | | Allow to stop any environmentKamil Trzcinski2016-11-102-4/+8
* | | | | | | | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-073-7/+37
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-073-7/+37
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipe...Kamil Trzciński2017-02-075-24/+58
|\ \ \ \ \ \ \
| * | | | | | | 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-062-5/+4
| * | | | | | | Added tests for the variables controller #update actionJose Ivan Vargas2017-02-061-2/+3
| * | | | | | | 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-062-2/+6
| * | | | | | | Changed the controller/route name to 'ci/cd' and renamed the corresponding filesJose Ivan Vargas2017-02-065-23/+14
| * | | | | | | Added private methods to initialize variables in the ci_cd_pipelines_controllerJose Ivan Vargas2017-02-061-5/+16
| * | | | | | | Corrected tests and changed trigger controller redirects to the ci_cd_pipelin...Jose Ivan Vargas2017-02-061-3/+3
| * | | | | | | Fixed badges testJose Ivan Vargas2017-02-061-1/+1
| * | | | | | | changed pipelines controller name to ci_cd_pipelinesJose Ivan Vargas2017-02-064-10/+10
| * | | | | | | Converted the views to partials that compose the menu item "pipelines"Jose Ivan Vargas2017-02-065-23/+41
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Backport of the frontend view, including testsJose Ivan Vargas2017-02-061-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-062-9/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-041-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-032-6/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-036-7/+11
| |\ \ \ \ \ \ \
| * | | | | | | | Serialize pipelines in the new merge request actionGrzegorz Bizon2017-02-031-1/+8
| * | | | | | | | Moves pagination to shared folderFilipa Lacerda2017-02-032-2/+0
| * | | | | | | | Use new vue js pipelines table to render in merge request viewFilipa Lacerda2017-02-031-7/+4
* | | | | | | | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-063-4/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-061-0/+1
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'git_to_html_redirection' into 'master' Sean McGivern2017-02-031-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fixed redirection from http://someproject.git to http://someprojectblackst0ne2017-02-041-1/+1
| | |/ / / / /
View Lorry Controller Status