summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix access token specsfix-specs-for-access-tokensSean McGivern2017-03-072-3/+3
* Merge branch 'zj-chat-teams-unique' into 'master' Kamil Trzciński2017-03-073-0/+15
|\
| * Namespace can have only one chat teamzj-chat-teams-uniqueZ.J. van de Weg2017-03-073-0/+15
* | Merge branch 'priority-to-label-priority' into 'master' Sean McGivern2017-03-074-7/+11
|\ \
| * | Rename priority sorting option to label priorityDimitrie Hoekstra2017-03-074-7/+11
|/ /
* | Merge branch '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-...Sean McGivern2017-03-0727-114/+328
|\ \
| * \ 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-072089-22418/+16234
| |\ \
| * | | Added test case for the avaiable project keysJose Ivan Vargas2017-03-061-4/+11
| * | | Renamed the redirect_request concern to repository_settings_redirectJose Ivan Vargas2017-03-064-4/+4
| * | | Removed repository_helper.rbJose Ivan Vargas2017-03-061-22/+0
| * | | Fixed repository_controller_specJose Ivan Vargas2017-03-062-5/+8
| * | | Added delegations to comply with the new rubocop rulesJose Ivan Vargas2017-03-066-47/+31
| * | | Added tests for the repository_controller and repository_helperJose Ivan Vargas2017-03-0612-33/+121
| * | | Added access spec testsJose Ivan Vargas2017-03-068-24/+45
| * | | Add access spec tests for the /settings/repository routeJose Ivan Vargas2017-03-061-0/+14
| * | | Introduced the deploy keys presenterGrzegorz Bizon2017-03-067-32/+110
| * | | Fixed tests, changed dispatcher routing to the 'repository:show'Jose Ivan Vargas2017-03-068-38/+26
| * | | Created the gear settings entry and created a way to initialize both sections...Jose Ivan Vargas2017-03-0610-27/+68
| * | | Added repository controller and route for the settings namespaceJose Ivan Vargas2017-03-063-0/+12
* | | | Merge branch '27936-avatar-has-wrong-cache-settings' into 'master' Douwe Maan2017-03-073-0/+88
|\ \ \ \
| * | | | Ensure mutable uploads are not cached without revalidationPawel Chojnacki2017-02-223-0/+88
* | | | | Merge branch 'prometheus-monitoring' into 'master' Rémy Coutable2017-03-0730-28/+2301
|\ \ \ \ \
| * | | | | Added Prometheus Service and Prometheus graphsKamil Trzciński2017-03-0730-28/+2301
|/ / / / /
* | | | | Merge branch '28447-hybrid-repository-storages' into 'master' Sean McGivern2017-03-0728-65/+178
|\ \ \ \ \
| * | | | | Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-0328-65/+178
* | | | | | Merge branch 'rfr-20170307-change-default-project-number-limit' into 'master' James Lopez2017-03-073-4/+8
|\ \ \ \ \ \
| * | | | | | Change project count limit from 10 to 100000rfr-20170307-change-default-project-number-limitRegis Freyd2017-03-073-4/+8
* | | | | | | Merge branch 'fix/gb/deprecate-ci-config-types' into 'master' Kamil Trzciński2017-03-072-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Add Changelog entry for CI/CD types deprecationfix/gb/deprecate-ci-config-typesGrzegorz Bizon2017-03-071-0/+4
| * | | | | | | Deprecate usage of `types` CI/CD configuration entryGrzegorz Bizon2017-03-071-1/+3
* | | | | | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-0736-131/+731
|\ \ \ \ \ \ \ \
| * | | | | | | | Add specs for Doorkeeper resource_owner_authenticatorMarkus Koller2017-03-072-6/+65
| * | | | | | | | Remove whitespace in GemfileMarkus Koller2017-03-071-51/+51
| * | | | | | | | Require explicit scopes on personal access tokensMarkus Koller2017-03-074-29/+26
| * | | | | | | | Only use API scopes for personal access tokensMarkus Koller2017-03-076-3/+64
| * | | | | | | | Don't allow blocked users to authenticate through other meansMarkus Koller2017-03-076-3/+81
| * | | | | | | | Make sure scopes are loaded in admin OAuth application formMarkus Koller2017-03-072-1/+66
| * | | | | | | | Remove duplicated code in Oauth::AuthorizationsControllerMarkus Koller2017-03-071-42/+2
| * | | | | | | | Implement OpenID Connect identity providerMarkus Koller2017-03-0723-9/+388
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-0730-145/+1053
|\ \ \ \ \ \ \ \
| * | | | | | | | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-0627-649/+313
| * | | | | | | | refactors finder and correlated codeTiago Botelho2017-03-0117-202/+378
| * | | | | | | | applies relevant changes to the code and code structureTiago Botelho2017-02-2824-279/+317
| * | | | | | | | refactors documentation and personal access tokens form to not allow admins t...Tiago Botelho2017-02-2814-127/+230
| * | | | | | | | add admin panel for personal access tokensSimon Vocella2017-02-287-0/+269
| * | | | | | | | add documentation and changelog entry for user personal access tokens apiSimon Vocella2017-02-284-0/+152
| * | | | | | | | Add text-warning class in profile settings if the personal_access_token expir...Simon Vocella2017-02-282-3/+4
| * | | | | | | | add impersonation tokenSimon Vocella2017-02-2810-35/+116
| * | | | | | | | manage personal_access_tokens through apiSimon Vocella2017-02-2812-3/+427
* | | | | | | | | Merge branch '28559-remove-active-underline' into 'master' Annabel Dunstone Gray2017-03-071-0/+4
|\ \ \ \ \ \ \ \ \