summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '11-6-security-2773-milestones-fix' into '11-6-stable'Yorick Peterse2019-02-271-1/+1
|\
| * Check issue milestone availabilityJarka Košanová2019-02-131-1/+1
* | Merge branch 'security-kubernetes-google-login-csrf-11-6' into '11-6-stable'Yorick Peterse2019-02-271-19/+41
|\ \
| * | Validate session key when authorizing with GCP to create a clusterTiger2019-02-191-19/+41
| |/
* | Merge branch 'security-56348-11-6' into '11-6-stable'Yorick Peterse2019-02-271-0/+4
|\ \
| * | Check snippet attached file to be moved is within designated directoryMark Chao2019-02-211-0/+4
| |/
* | Merge branch 'security-add-public-internal-groups-as-members-to-your-project-...Yorick Peterse2019-02-272-0/+37
|\ \
| * | Update specsMałgorzata Ksionek2019-02-211-6/+4
| * | Change how path is calledMałgorzata Ksionek2019-02-211-6/+4
| * | Fix conflictMałgorzata Ksionek2019-02-202-4/+45
| |/
* | Prevent disclosing project milestone titlesFelipe Artur2019-02-261-0/+37
|/
* Merge branch 'sh-fix-issue-56663-11-6' into 'security-11-6'Yorick Peterse2019-01-242-3/+16
* Merge branch 'security-contributed-projects-11-6' into 'security-11-6'Yorick Peterse2019-01-241-0/+32
* Merge branch 'security-11-6-test-permissions' into 'security-11-6'Yorick Peterse2019-01-242-16/+42
* Merge branch 'security-fix-new-issues-login-message-11-6' into 'security-11-6'Yorick Peterse2019-01-241-1/+1
* Resolve Rails 4 spec failureRobert Speicher2019-01-161-1/+1
* Merge branch 'sh-fix-request-profiles-html' into 'master'Sean McGivern2019-01-161-0/+47
* Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stableJohn Jarvis2018-12-273-1/+60
|\
| * Merge branch 'security-fix/security-group-user-removal-11-6' into 'security-1...John Jarvis2018-12-271-1/+1
| |\
| | * Merge branch 'security-11-6' into 'security-fix/security-group-user-removal-1...James Lopez2018-12-272-14/+65
| | |\
| | * | Add subresources removal to member destroy serviceJames Lopez2018-12-131-1/+1
| * | | Merge remote-tracking branch 'origin/security-48259-private-snippet-11-6' int...John Jarvis2018-12-272-0/+59
| |\ \ \ | | |_|/ | |/| |
| | * | Block private snippets from being embeddableMark Chao2018-12-202-0/+59
| | |/
* | | Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stableJohn Jarvis2018-12-272-14/+65
|\ \ \ | |/ /
| * | Merge branch 'security-11-6-group-cicd-settings-accessible-to-maintainer' int...John Jarvis2018-12-271-10/+45
| |\ \
| | * | Use old-style controller request paramsMatija Čupić2018-12-241-2/+2
| | * | Check for group admin permissionsMatija Čupić2018-12-241-10/+45
| | |/
| * | Project guests no longer are able to see refs pageTiago Botelho2018-12-101-4/+20
| |/
* | Merge branch 'fj-remove-forced-disposition-attachment-ssh-keys' into 'master'Douwe Maan2018-12-181-6/+0
* | Merge branch '55230-remove-project-cleanup-feature-flag' into 'master'Douwe Maan2018-12-181-25/+5
* | Merge branch 'sh-reject-refs-with-invalid-chars' into 'master'Douwe Maan2018-12-171-0/+30
* | Merge branch 'issue_55024' into 'master'Nick Thomas2018-12-142-0/+4
* | Merge branch '20422-hide-ui-variables-by-default' into 'master'Robert Speicher2018-12-071-9/+47
|\ \
| * \ Merge remote-tracking branch 'origin/master' into 20422-hide-ui-variables-by-...jhampton2018-12-0730-308/+797
| |\ \
| * | | Extract context in JobsController specMatija Čupić2018-12-071-38/+40
| * | | Fixes rubocop offensesjhampton2018-12-071-4/+0
| * | | Adjusts tests per MR feedbackjhampton2018-12-061-10/+31
| * | | Fixes broken testsjhampton2018-12-061-0/+19
* | | | Allow public forks to be deduplicatedZeger-Jan van de Weg2018-12-071-1/+1
| |/ / |/| |
* | | Merge branch 'store-correlation-logs' into 'master'Stan Hu2018-12-071-0/+8
|\ \ \
| * | | Revert "Prefer to use correlation-id in logs"Kamil Trzciński2018-12-061-1/+1
| * | | Prefer to use correlation-id in logsKamil Trzciński2018-12-061-1/+1
| * | | Log and pass correlation-id between Unicorn, Sidekiq and GitalyKamil Trzciński2018-12-061-0/+8
* | | | Merge branch '22548-reopen-error-message' into 'master'Filipa Lacerda2018-12-071-0/+14
|\ \ \ \
| * | | | Inline the new checks into normal update error handlingNick Thomas2018-12-071-3/+5
| * | | | Link to conflicting MR in reopening error messageAkos Gyimesi2018-12-061-1/+1
| * | | | Improve error message when attempting to reopen MR and there's a new open MR ...Akos Gyimesi2018-12-061-0/+12
| |/ / /
* | | | Remove Sidekiq::Testing in RepositoryController specDylan Griffith2018-12-071-4/+6
* | | | Merge branch 'move-group-issues-search-cte-up-the-chain' into 'master'Douwe Maan2018-12-071-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add a flag to use a subquery for group issues searchSean McGivern2018-11-301-1/+2
View Lorry Controller Status