summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-project-without-repo-and-wiki' into 'master' Rémy Coutable2017-03-161-2/+3
* Merge branch '8836-mr-revert' into 'master' Robert Speicher2017-03-151-1/+1
* Merge branch 'dz-nested-groups-members' into 'master' Dmitriy Zaporozhets2017-03-101-33/+4
* Merge branch 'master' into orderable-issuesDouwe Maan2017-03-0711-110/+205
|\
| * Fix access token specsfix-specs-for-access-tokensSean McGivern2017-03-071-1/+1
| * Merge branch '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-...Sean McGivern2017-03-074-52/+71
| |\
| | * 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-076-17/+22
| | |\
| | * | Renamed the redirect_request concern to repository_settings_redirectJose Ivan Vargas2017-03-063-3/+3
| | * | Fixed repository_controller_specJose Ivan Vargas2017-03-061-4/+7
| | * | Added delegations to comply with the new rubocop rulesJose Ivan Vargas2017-03-061-2/+21
| | * | Added tests for the repository_controller and repository_helperJose Ivan Vargas2017-03-064-21/+26
| | * | Added access spec testsJose Ivan Vargas2017-03-062-18/+1
| | * | Introduced the deploy keys presenterGrzegorz Bizon2017-03-061-18/+3
| | * | Fixed tests, changed dispatcher routing to the 'repository:show'Jose Ivan Vargas2017-03-062-25/+8
| | * | Created the gear settings entry and created a way to initialize both sections...Jose Ivan Vargas2017-03-063-10/+42
| | * | Added repository controller and route for the settings namespaceJose Ivan Vargas2017-03-061-0/+9
| * | | Merge branch '27936-avatar-has-wrong-cache-settings' into 'master' Douwe Maan2017-03-071-0/+2
| |\ \ \
| | * | | Ensure mutable uploads are not cached without revalidationPawel Chojnacki2017-02-221-0/+2
| * | | | Added Prometheus Service and Prometheus graphsKamil Trzciński2017-03-071-1/+14
| * | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-073-44/+4
| |\ \ \ \
| | * | | | Only use API scopes for personal access tokensMarkus Koller2017-03-071-1/+1
| | * | | | Make sure scopes are loaded in admin OAuth application formMarkus Koller2017-03-071-1/+1
| | * | | | Remove duplicated code in Oauth::AuthorizationsControllerMarkus Koller2017-03-071-42/+2
| * | | | | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-072-5/+63
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-062-23/+17
| | * | | | refactors finder and correlated codeTiago Botelho2017-03-012-12/+27
| | * | | | applies relevant changes to the code and code structureTiago Botelho2017-02-283-50/+50
| | * | | | refactors documentation and personal access tokens form to not allow admins t...Tiago Botelho2017-02-281-1/+2
| | * | | | add admin panel for personal access tokensSimon Vocella2017-02-281-0/+48
| * | | | | Improve pipeline triggers UIKamil Trzciński2017-03-071-8/+51
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov2017-03-074-15/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'protected-branch-dropdown-headings' into 'master' Sean McGivern2017-03-071-2/+2
| |\ \ \ \
| | * | | | Backport protected branches Ruby change from EEprotected-branch-dropdown-headingsPhil Hughes2017-03-061-2/+2
| | | |_|/ | | |/| |
| * | | | Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-072-11/+1
| |\ \ \ \
| | * | | | Use native unicode emojisEric Eastwood2017-03-062-11/+1
| * | | | | Merge branch 'zj-create-mattermost-team' into 'master' Kamil Trzciński2017-03-061-2/+10
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master' into 'zj-create-mattermost-team'Zeger-Jan van de Weg2017-03-064-11/+14
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-0611-73/+93
| | |\ \ \ \
| | * | | | | Fix linter errorsZ.J. van de Weg2017-03-031-1/+1
| | * | | | | Merge branch 'master' into 'zj-create-mattermost-team'Luke "Jared" Bennett2017-03-023-49/+23
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-0210-69/+77
| | |\ \ \ \ \ \
| | * | | | | | | Improve UXZ.J. van de Weg2017-03-021-1/+7
| | * | | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-2427-155/+214
| | |\ \ \ \ \ \ \
| | * | | | | | | | Finished up mattermost team creationzj-create-mattermost-team-lbLuke "Jared" Bennett2017-02-221-2/+1
| | * | | | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-2010-17/+53
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Transactional mattermost team creationZ.J. van de Weg2017-02-201-1/+0
| | * | | | | | | | | Improve DRYness of viewsZ.J. van de Weg2017-02-161-1/+4
| | * | | | | | | | | Add tests for Mattermost team creationZ.J. van de Weg2017-02-161-0/+1
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issuesValery Sizov2017-03-0610-14/+33
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Make Warden set_user hook validate user ip uniqunessPawel Chojnacki2017-03-061-1/+1
View Lorry Controller Status