summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Merge branch 'render-json-leak' into 'security' DJ Mountney2017-03-202-0/+36
* | | Merge branch '20204-new-issue-button-redirects-you-to-create-a-new-issue-afte...Sean McGivern2017-03-201-0/+11
|\ \ \ | |/ / |/| |
| * | Redirect to signin when New Issue for not logged inSam Rose2017-03-201-0/+11
* | | All CI offline migrationsKamil Trzciński2017-03-171-1/+1
| |/ |/|
* | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master' Filipa Lacerda2017-03-161-0/+14
|\ \
| * | Add 'Undo mark all as done' to TodosJacopo2017-03-161-0/+14
* | | Merge branch 'fix-project-without-repo-and-wiki' into 'master' Rémy Coutable2017-03-161-0/+2
|\ \ \
| * | | Expect @issuable_meta_data to be set, feedback:fix-project-without-repo-and-wikiLin Jen-Shin2017-03-161-0/+1
| * | | Fix projects without repo and wikiLin Jen-Shin2017-03-151-0/+1
| |/ /
* | | Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'Stan Hu2017-03-151-45/+0
|/ /
* | Merge branch 'feature/custom-lfs' into 'master' Douwe Maan2017-03-131-18/+43
|\ \
| * | Do not show LFS object when LFS is disabledChristopher Bartz2017-03-131-18/+43
* | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' Douwe Maan2017-03-131-4/+34
|\ \ \ | |/ / |/| |
| * | Rename variableBob Van Landuyt2017-03-131-4/+4
| * | Separate flash messages for resolving one or multiple discussionsBob Van Landuyt2017-03-131-12/+12
| * | Add a flash messages when an issue resolving discussions is createdBob Van Landuyt2017-03-131-0/+14
| * | Always require MR-iid for resolving discussionsBob Van Landuyt2017-03-131-3/+10
| * | Delegate a single discussion to a new issueBob Van Landuyt2017-03-131-0/+9
| |/
* | New file from interface on existing branchJacopo2017-03-131-0/+14
|/
* Merge branch 'master' into orderable-issuesDouwe Maan2017-03-075-19/+239
|\
| * Fix access token specsfix-specs-for-access-tokensSean McGivern2017-03-071-2/+2
| * Merge branch '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-...Sean McGivern2017-03-071-0/+20
| |\
| | * Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirro...26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pagesPhil Hughes2017-03-073-10/+23
| | |\
| | * | Fixed repository_controller_specJose Ivan Vargas2017-03-061-1/+1
| | * | Added delegations to comply with the new rubocop rulesJose Ivan Vargas2017-03-061-2/+2
| | * | Added tests for the repository_controller and repository_helperJose Ivan Vargas2017-03-061-0/+20
| * | | Merge branch '27936-avatar-has-wrong-cache-settings' into 'master' Douwe Maan2017-03-071-0/+82
| |\ \ \
| | * | | Ensure mutable uploads are not cached without revalidationPawel Chojnacki2017-02-221-0/+82
| * | | | Added Prometheus Service and Prometheus graphsKamil Trzciński2017-03-071-0/+46
| * | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-072-21/+72
| |\ \ \ \
| | * | | | Require explicit scopes on personal access tokensMarkus Koller2017-03-071-22/+7
| | * | | | Make sure scopes are loaded in admin OAuth application formMarkus Koller2017-03-071-0/+65
| | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-071-4/+25
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-061-2/+2
| | * | | refactors documentation and personal access tokens form to not allow admins t...Tiago Botelho2017-02-281-6/+2
| | * | | add impersonation tokenSimon Vocella2017-02-281-2/+27
| | * | | manage personal_access_tokens through apiSimon Vocella2017-02-281-2/+2
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov2017-03-072-8/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'remove-readme-option' into 'master' Dmitriy Zaporozhets2017-03-071-8/+0
| |\ \ \ \
| | * | | | Remove readme-only project view preferenceremove-readme-optionAnnabel Dunstone Gray2017-03-061-8/+0
| * | | | | Add a Project::UploadsController spec to ensure an Upload is createdRobert Speicher2017-03-061-0/+13
| |/ / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov2017-03-066-19/+67
|\ \ \ \ \ | |/ / / /
| * | | | Make Warden set_user hook validate user ip uniqunessPawel Chojnacki2017-03-061-3/+3
| * | | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ...Pawel Chojnacki2017-03-061-0/+1
| * | | | Cleanup RSpec testsPawel Chojnacki2017-03-061-21/+2
| * | | | Test various login scenarios if the limit gets enforcedPawel Chojnacki2017-03-061-2/+28
| | |_|/ | |/| |
| * | | Merge branch '1648-remove-remnants-of-git-annex-support' into 'master' Robert Speicher2017-03-061-10/+0
| |\ \ \
View Lorry Controller Status