summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory n...refactor-clustersShinya Maeda2017-11-061-81/+0
* Merge branch 'master' into refactor-clustersShinya Maeda2017-11-061-0/+5
|\
| * Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-061-0/+5
| |\
| | * Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-211-0/+5
* | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-052-0/+63
|\ \ \ | |/ /
| * | Merge branch 'issue_39176' into 'master'Douwe Maan2017-11-031-0/+13
| |\ \
| | * | Render 404 when polling commit notes without having permissionsissue_39176Felipe Artur2017-11-031-0/+13
| * | | Merge branch 'bvl-unlink-fixes' into 'master'Douwe Maan2017-11-031-0/+50
| |\ \ \
| | * | | Find the LFS-objects for a fork within a the fork networkBob Van Landuyt2017-11-031-0/+50
* | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-034-96/+96
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'pawel/disable_nfs_metrics_checks_39730' into 'master'Stan Hu2017-11-021-11/+0
| |\ \ \ \
| | * | | | Remove Filesystem check metrics that use too much CPU to handle requestspawel/disable_nfs_metrics_checks_39730Pawel Chojnacki2017-11-021-11/+0
| | |/ / /
| * | | | Merge branch 'dm-remove-private-token' into 'master'Sean McGivern2017-11-021-58/+28
| |\ \ \ \
| | * | | | Remove authentication using user.private_tokenDouwe Maan2017-11-021-58/+28
| | |/ / /
| * | | | CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-022-27/+68
| |/ / /
* | | | Fix some testsShinya Maeda2017-11-031-74/+79
* | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.Shinya Maeda2017-11-011-2/+2
* | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0178-454/+505
|\ \ \ \ | |/ / /
| * | | Load participants asyncEric Eastwood2017-10-311-3/+3
| * | | Allow promoting project milestones to group milestonesFelipe Artur2017-10-311-0/+28
| |/ /
| * | Merge branch 'zj-commit-cache' into 'master'Sean McGivern2017-10-271-1/+1
| |\ \
| | * | Cache commits on the repository modelZeger-Jan van de Weg2017-10-271-1/+1
| * | | Revert "Merge branch '36670-remove-edit-form' into 'master'"39441-bring-edit-form-backSean McGivern2017-10-261-0/+23
| |/ /
| * | Merge branch '35644-refactor-have-http-status-into-have-gitlab-http-status' i...Rémy Coutable2017-10-2378-453/+453
| |\ \
| | * | Refactor `have_http_status` into `have_gitlab_http_status` in the specsJacopo2017-10-2078-453/+453
| | |/
* | | specs for featureShinya Maeda2017-11-011-1/+6
* | | specs for controller. Improved validationShinya Maeda2017-10-311-166/+377
|/ /
* | Merge branch 'bvl-fix-group-atom-feed' into 'master'Douwe Maan2017-10-221-0/+25
|\ \
| * | Make sure we render events for projects within a groupBob Van Landuyt2017-10-201-0/+25
| |/
* | URI decode Page-Title header to preserve UTF-8 charactersToon Claes2017-10-201-0/+14
|/
* Merge branch 'not-found-in-commits' into 'master'Douwe Maan2017-10-191-2/+29
|\
| * Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-181-2/+29
* | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-182-34/+67
|\ \
| * \ Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-176-83/+478
| |\ \
| * | | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-172-34/+67
* | | | Merge branch '30140-restore-readme-only-preference' into 'master'Douwe Maan2017-10-181-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Add readme only option as project viewAnnabel Dunstone Gray2017-10-161-0/+8
| |/ /
* | | Merge branch 'zj-gitaly-n-1-call-test' into 'master'Douwe Maan2017-10-171-11/+21
|\ \ \
| * | | Allow testing on Gitaly call countZeger-Jan van de Weg2017-10-161-11/+21
* | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-175-72/+457
|\ \ \ \ | |_|/ / |/| | |
| * | | Make sure we always return an array of hierarchiesBob Van Landuyt2017-10-131-0/+9
| * | | Nest the group_children_path inside the canonical group pathBob Van Landuyt2017-10-122-270/+277
| * | | Fix spinach featuresBob Van Landuyt2017-10-111-1/+0
| * | | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1014-60/+640
| |\ \ \ | | |/ /
| * | | Don't load unneeded elements in GroupsController#showBob Van Landuyt2017-10-101-45/+44
| * | | Only expand ancestors when searchingBob Van Landuyt2017-10-091-1/+12
| * | | Make sure all ancestors are loaded when searching groupsBob Van Landuyt2017-10-051-2/+2
| * | | Return an empty array when no matches are foundBob Van Landuyt2017-10-041-0/+10
| * | | Fix bug with project paginationBob Van Landuyt2017-10-041-5/+7
| * | | Only preload ancestors for search results in the specified parentBob Van Landuyt2017-10-041-0/+10