summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_25900_2' into 'master' Sean McGivern2017-02-132-0/+6
|\
| * Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-092-0/+6
* | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-usersRobert Speicher2017-02-101-54/+10
|/
* Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master' Fatih Acet2017-02-071-1/+7
|\
| * Fix merge request controller specs for new actionfix/gb/invalid-new-merge-request-apiGrzegorz Bizon2017-02-071-1/+7
* | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-071-16/+73
|\ \ | |/ |/|
| * Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-071-16/+73
* | Merge branch '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipe...Kamil Trzciński2017-02-072-0/+79
|\ \
| * | Fixed variables_controller_spec.rb test26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pagesJose Ivan Vargas2017-02-061-2/+1
| * | Improved code styling on the variables_controller_specJose Ivan Vargas2017-02-061-7/+11
| * | Added tests for the variables controller #update actionJose Ivan Vargas2017-02-061-1/+26
| * | Added a variable_controller_spec test to test for flash messages on the #crea...Jose Ivan Vargas2017-02-062-0/+31
| * | Fixed tests, renamed files and methodsJose Ivan Vargas2017-02-061-1/+1
| * | Removed options from the gear button in the projects and consolidated into oneJose Ivan Vargas2017-02-061-0/+20
* | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-061-19/+24
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-032-27/+51
| |\ \ | | |/
| * | Add time ago auto-update to the 2 newest tablesFilipa Lacerda2017-02-031-8/+1
| * | Add basic specs for new merge requests pipelines APIGrzegorz Bizon2017-02-031-11/+23
* | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-062-27/+51
|\ \ \ | | |/ | |/|
| * | Reuse endpoint to list issues for a list instead of create a new oneDouglas Barbosa Alexandre2017-02-031-26/+50
| * | Fix spec for Projects::Boards::ListsControllerDouglas Barbosa Alexandre2017-02-031-1/+1
| |/
* | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-032-3/+84
|\ \ | |/
| * Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-021-1/+2
| |\
| | * Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-024-17/+101
| | |\
| | * \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2627-32/+34
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2611-30/+279
| | |\ \ \
| | * \ \ \ Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-049-7/+337
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-101-1/+14
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-082-1/+63
| | |\ \ \ \ \ \
| | * | | | | | | Fix tests to use the new APILin Jen-Shin2016-12-081-1/+2
| * | | | | | | | Use `add_$role` helper in snippets specssnippet-spamSean McGivern2017-02-021-4/+4
| * | | | | | | | Check public snippets for spamSean McGivern2017-02-021-0/+80
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Fix 500 error while navigating to the `pages_domains` 'show' page.Timothy Andrew2017-01-311-0/+64
|/ / / / / / /
* | | | | | | Merge branch '24021-Migrate-Projects-Labels-to-Group-Labels' into 'master'27283-fix-wrong-label-hide-show-whitespaceSean McGivern2017-01-311-0/+45
|\ \ \ \ \ \ \
| * | | | | | | Abillity to promote project labels to group labelsRitave2017-01-311-0/+45
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'zj-display-error-team-fetch' into 'master' Kamil Trzciński2017-01-311-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix inconsistent return typeZ.J. van de Weg2017-01-241-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Use ApiHelpers in merge request specs for API routesfeature/gb/expose-commit-and-mr-pipelines-apiGrzegorz Bizon2017-01-301-11/+5
* | | | | | | Add controller tests for commit pipelines endpointGrzegorz Bizon2017-01-271-5/+19
* | | | | | | Add controller test for merge requests pipelines APIGrzegorz Bizon2017-01-271-1/+32
| |/ / / / / |/| | | | |
* | | | | | Use `empty_project` where possible in controller specsrs-empty_project-controllersRobert Speicher2017-01-2527-32/+34
|/ / / / /
* | | | | adds test suite22974-trigger-service-events-through-apiTiago Botelho2017-01-221-0/+1
* | | | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-201-0/+20
|\ \ \ \ \
| * | | | | Corrected code style and titlesJose Ivan Vargas2017-01-181-2/+2
| * | | | | Fixed more testsJose Ivan Vargas2017-01-181-1/+1
| * | | | | Fixed spinach feature tests for the services and hooks controllersJose Ivan Vargas2017-01-181-0/+20
* | | | | | Merge branch '26117-sort-pipeline-for-commit' into 'master' Kamil Trzciński2017-01-191-3/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add sorting pipeline for a commitTakuya Noguchi2017-01-191-3/+35
* | | | | | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-181-16/+32
|\ \ \ \ \ \
| * | | | | | Backport backend work for time tracking.Ruben Davila2017-01-151-16/+32