summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | 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
|\ \ \ \ \
| * | | | | Use detailed_status effectively. Remove unnecesarry context(nest). Add new co...Shinya Maeda2017-03-233-50/+53
| * | | | | Rename endpoints 'status' to 'pipeline_status' in merge_requestsShinya Maeda2017-03-231-6/+6
| * | | | | Add more specsShinya Maeda2017-03-233-0/+9
| * | | | | Fix rspec failureShinya Maeda2017-03-233-6/+18
| * | | | | 3 lines to One line. Correct spec caption.Shinya Maeda2017-03-233-3/+3
| * | | | | Fix rubocop angerShinya Maeda2017-03-233-12/+12
| * | | | | Add controllers specShinya Maeda2017-03-233-0/+67
| | |_|_|/ | |/| | |
* | | | | Merge branch '20204-new-issue-button-redirects-you-to-create-a-new-issue-afte...Sean McGivern2017-03-271-0/+1
|\ \ \ \ \
| * | | | | Display flash message to unauthenticated user when creating new issueSam Rose2017-03-251-0/+1
| |/ / / /
* | | | | Implement new service for creating userGeorge Andrinopoulos2017-03-271-0/+9
| |_|_|/ |/| | |
* | | | Use project.add_developer insetad of <<Shinya Maeda2017-03-231-1/+1
* | | | Add builds_controller_specs and spec for #traceShinya Maeda2017-03-231-0/+47
|/ / /
* | | Merge branch '29483-spam-check-only-title-and-description' into 'master' Sean McGivern2017-03-221-3/+20
|\ \ \
| * | | Present ajax call errors when failing to update an IssueOswaldo Ferreira2017-03-211-3/+20
* | | | Merge branch 'sh-fix-issue-29739' into 'master' Sean McGivern2017-03-211-0/+11
|\ \ \ \
| * | | | Fix Error 500 when Bitbucket importer does not have authorizationStan Hu2017-03-201-0/+11
| | |_|/ | |/| |
* | | | Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-211-0/+28
|\ \ \ \ | |_|/ / |/| | |
| * | | Undo explicit conversion to IntegerToon Claes2017-03-201-0/+28
| | |/ | |/|
* | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-202-0/+36
|\ \ \ | |_|/ |/| |