summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix access token specsfix-specs-for-access-tokensSean McGivern2017-03-071-1/+1
* Merge branch 'zj-chat-teams-unique' into 'master' Kamil Trzciński2017-03-071-0/+1
|\
| * Namespace can have only one chat teamzj-chat-teams-uniqueZ.J. van de Weg2017-03-071-0/+1
* | Rename priority sorting option to label priorityDimitrie Hoekstra2017-03-071-1/+1
* | Merge branch '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-...Sean McGivern2017-03-0717-106/+184
|\ \
| * \ 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-071892-2868/+3956
| |\ \
| * | | Renamed the redirect_request concern to repository_settings_redirectJose Ivan Vargas2017-03-063-3/+3
| * | | Removed repository_helper.rbJose Ivan Vargas2017-03-061-22/+0
| * | | Fixed repository_controller_specJose Ivan Vargas2017-03-061-4/+7
| * | | Added delegations to comply with the new rubocop rulesJose Ivan Vargas2017-03-064-23/+29
| * | | Added tests for the repository_controller and repository_helperJose Ivan Vargas2017-03-068-26/+41
| * | | Added access spec testsJose Ivan Vargas2017-03-065-24/+12
| * | | Introduced the deploy keys presenterGrzegorz Bizon2017-03-066-32/+82
| * | | Fixed tests, changed dispatcher routing to the 'repository:show'Jose Ivan Vargas2017-03-065-30/+16
| * | | 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-062-0/+11
* | | | 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-0713-1/+577
* | | | | Merge branch '28447-hybrid-repository-storages' into 'master' Sean McGivern2017-03-074-9/+5
|\ \ \ \ \
| * | | | | Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-034-9/+5
* | | | | | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-077-45/+22
|\ \ \ \ \ \
| * | | | | | Require explicit scopes on personal access tokensMarkus Koller2017-03-071-3/+4
| * | | | | | Only use API scopes for personal access tokensMarkus Koller2017-03-072-1/+11
| * | | | | | 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
| * | | | | | Implement OpenID Connect identity providerMarkus Koller2017-03-073-1/+7
* | | | | | | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-0712-106/+241
|\ \ \ \ \ \ \
| * | | | | | | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-0610-168/+107
| * | | | | | | refactors finder and correlated codeTiago Botelho2017-03-016-55/+62
| * | | | | | | applies relevant changes to the code and code structureTiago Botelho2017-02-2811-147/+183
| * | | | | | | refactors documentation and personal access tokens form to not allow admins t...Tiago Botelho2017-02-285-43/+15
| * | | | | | | add admin panel for personal access tokensSimon Vocella2017-02-285-0/+169
| * | | | | | | Add text-warning class in profile settings if the personal_access_token expir...Simon Vocella2017-02-281-2/+3
| * | | | | | | add impersonation tokenSimon Vocella2017-02-281-4/+10
| * | | | | | | manage personal_access_tokens through apiSimon Vocella2017-02-281-0/+5
* | | | | | | | Merge branch '28559-remove-active-underline' into 'master' Annabel Dunstone Gray2017-03-071-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | don't underline clicked links in Notes header28559-remove-active-underlineSimon Knox2017-03-071-0/+4
* | | | | | | | | Merge branch '26790-label-color-todos' into 'master' Douwe Maan2017-03-071-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | whitelist style attribute in event_notemhasbini2017-03-071-1/+6
* | | | | | | | | | Merge branch '28835-jobs-head' into 'master' Annabel Dunstone Gray2017-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | fix Jobs header height - only set fixed size for rows28835-jobs-headSimon Knox2017-03-071-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'feature/runner-jobs-v4-api' into 'master' Kamil Trzciński2017-03-072-1/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add minor refactoringfeature/runner-jobs-v4-apiTomasz Maczukin2017-03-071-4/+2
| * | | | | | | | | Change artifacts and cache fields to arraysTomasz Maczukin2017-03-061-2/+2
| * | | | | | | | | Add some fixes and refactoring after reviewTomasz Maczukin2017-03-021-10/+4
| * | | | | | | | | Refactor JobRequest response structureTomasz Maczukin2017-03-022-1/+30
* | | | | | | | | | Merge branch 'sort-builds-in-stage' into 'master' Sean McGivern2017-03-072-4/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Sort builds in stage dropdownKamil Trzcinski2017-03-072-4/+6
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'feature/gb/add-blocked-pipeline-mr-widget-state' into 'master' Kamil Trzciński2017-03-074-1/+9
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status