summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \
| | * | | Remove remnants of git annexPawel Chojnacki2017-03-031-10/+0
| * | | | Merge branch '28898-fix-search-branches-in-cherry-picking' into 'master' Sean McGivern2017-03-061-0/+23
| |\ \ \ \
| | * | | | Fix json response in branches controllerGeorge Andrinopoulos2017-03-061-0/+23
| | | |/ / | | |/| |
| * | | | Merge branch 'etag-notes-polling' into 'master' Sean McGivern2017-03-061-0/+27
| |\ \ \ \
| | * | | | Remove query parameters from notes polling endpoint to make caching easierAdam Niedzielski2017-03-011-0/+27
| | |/ / /
| * | | | Merge branch 'change-colour-for-testing-fallback' into 'master' Rémy Coutable2017-03-061-5/+5
| |\ \ \ \
| | * | | | Change language for testing colour fallbackGeorg G2017-02-261-5/+5
| * | | | | Bump health_check gem to version 2.6.0bump-health-check-gemDouglas Barbosa Alexandre2017-03-031-2/+2
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov2017-03-035-105/+74
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix cherry-picking or reverting through an MRDouwe Maan2017-03-021-6/+6
| | |_|/ / | |/| | |
| * | | | Cleaning up navigational order - ProjectKushal Pandya2017-03-021-2/+18
| * | | | Merge branch 'fix/gb/remove-deprecated-ci-build-status-badge' into 'master'Rémy Coutable2017-03-021-74/+0
| |\ \ \ \
| | * | | | Remove deprecated legacy CI project status badgeGrzegorz Bizon2017-03-011-74/+0
| | | |/ / | | |/| |
| * | | | Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-011-17/+17
| |\ \ \ \
| | * | | | Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-011-17/+17
| | |/ / /
| * | | | Merge branch 'fix/gb/improve-merge-request-pipelines-api' into 'master' Kamil Trzciński2017-03-011-1/+2
| |\ \ \ \
| | * | | | Reinstate new merge request pipelines hash in APIGrzegorz Bizon2017-02-281-1/+2
| | |/ / /
| * | | | Merge branch '28609-fix-redirect-to-home-page-url' into 'master' Robert Speicher2017-03-011-5/+31
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix the redirect to custom home page URL and move it to RootController28609-fix-redirect-to-home-page-urlRémy Coutable2017-02-271-5/+31
| | |/ /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov2017-02-282-5/+9
|\ \ \ \ | |/ / /
| * | | Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-272-5/+9
| |\ \ \ | | |/ / | |/| |
| | * | Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-242-5/+9
| | |/
View Lorry Controller Status