summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-073-0/+45
|\
| * Merge branch 'optimise-builds' into 'master' Sean McGivern2017-04-071-0/+33
| |\
| | * Count number of queriesKamil Trzcinski2017-04-071-0/+33
| * | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-072-0/+12
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-063-9/+359
| | |\
| | * | Protected Tags backend review changesJames Edwards-Jones2017-04-062-0/+2
| | * | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0616-27/+516
| | |\ \
| | * | | Clean up non TODO rubocop errorsJames Edwards-Jones2017-04-031-6/+6
| | * | | Protected tags copy/paste from protected branchesJames Edwards-Jones2017-03-311-0/+10
* | | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-071-0/+96
|\ \ \ \ \ | |/ / / /
| * | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track applica...Paweł Chojnacki2017-04-071-0/+96
| | |_|/ | |/| |
* | | | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-063-9/+359
|\ \ \ \ | |/ / /
| * | | Merge branch 'feature/multi-level-container-registry-images' into 'master' Kamil Trzciński2017-04-061-0/+84
| |\ \ \
| | * \ \ Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-066-1/+171
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-043-1/+33
| | |\ \ \
| | * | | | Fix container registry controller specsGrzegorz Bizon2017-04-041-0/+1
| | * | | | Refactor container registry repository tag stubsGrzegorz Bizon2017-04-031-3/+4
| | * | | | Ensure root container repository when visiting registryGrzegorz Bizon2017-04-031-0/+82
| * | | | | Linking to edit file directlyEric Eastwood2017-04-061-7/+76
| * | | | | rename cache db column with `_cached` suffixAlexis Reigel2017-04-061-2/+2
| * | | | | Rename skip_tfa session variable to skip_two_factorMarkus Koller2017-04-061-1/+1
| * | | | | Rename check_2fa_requirement to check_two_factor_requirementMarkus Koller2017-04-061-2/+2
| * | | | | Support 2FA requirement per-groupMarkus Koller2017-04-061-2/+199
| | |_|/ / | |/| | |
* | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-064-1/+38
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'open-redirect-fix-continue-to' into 'security' Sean McGivern2017-04-051-1/+8
| * | | | Merge branch 'open-redirect-host-fix' into 'security' Sean McGivern2017-04-053-0/+30
* | | | | Remove unused codeDouwe Maan2017-04-051-2/+1
* | | | | Address review commentsDouwe Maan2017-04-051-61/+7
* | | | | Add specsDouwe Maan2017-04-051-32/+154
* | | | | Fix some specsDouwe Maan2017-04-051-1/+2
* | | | | Satisfy RubocopDouwe Maan2017-04-052-2/+2
* | | | | Add option to start a new discussion on an MRDouwe Maan2017-04-055-5/+14
|/ / / /
* | | | Create subgroups if they don't exist while importing projectsJames Lopez2017-04-052-0/+133
| |/ / |/| |
* | | Don't use FFaker in factories, use sequences insteadRémy Coutable2017-04-031-1/+1
* | | Merge branch 'sh-fix-destroy-user-race' into 'master' Douwe Maan2017-04-031-0/+16
|\ \ \
| * | | Delete users asynchronouslysh-fix-destroy-user-raceStan Hu2017-04-021-0/+16
| |/ /
* | | Fix redirection after login when the referer have paramsmhasbini2017-04-021-0/+16
|/ /
* | Merge branch '25556-prevent-users-from-disconnecting-gitlab-account-from-cas'...Douwe Maan2017-03-311-15/+37
|\ \
| * | Prevent users from disconnecting gitlab account from CASTiago Botelho2017-03-311-15/+37
* | | Merge branch 'tc-cleanup-application-settings-spec' into 'master' Sean McGivern2017-03-301-7/+18
|\ \ \
| * | | Remove redundant code to convert restricted_levels to integersToon Claes2017-03-231-3/+11
| * | | Resolve future conflicts with CE -> EE mergeToon Claes2017-03-231-4/+7
* | | | Merge branch 'fix/gb/environments-folders-route' into 'master' Kamil Trzciński2017-03-281-0/+33
|\ \ \ \ | |_|/ / |/| | |
| * | | Add controller specs for environment folder actionGrzegorz Bizon2017-03-271-0/+33
* | | | Merge branch 'sh-bring-back-option-to-be-notified-of-own-activity' into 'mast...Robert Speicher2017-03-271-0/+45
|\ \ \ \
| * | | | Simplify specStan Hu2017-03-241-1/+1
| * | | | Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-245-3/+142
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-202-1/+12
| |\ \ \ \
| * | | | | Revert "Merge branch '8836-mr-revert' into 'master'Stan Hu2017-03-161-0/+45
* | | | | | Merge branch '12818-expose-simple-cicd-status-endpoints-with-status-serialize...Kamil Trzciński2017-03-273-0/+91
|\ \ \ \ \ \