summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10-7-stable' into 10-7-stable-prepare-rc4Robert Speicher2018-04-101-1/+1
|\
| * Update VERSION to 10.7.0-rc3v10.7.0-rc3Robert Speicher2018-04-101-1/+1
| * Merge branch 'sh-fix-recaptcha-test' into 'master'Stan Hu2018-04-102-4/+1
* | Merge branch 'gitaly-0.95.0' into 'master'Sean McGivern2018-04-101-1/+1
* | Merge branch 'update_vendored_gitlab_ci_yml_for_auto_devops' into 'master'Robert Speicher2018-04-101-11/+42
* | Merge branch 'ab-37125-assigned-issues-query' into 'master'Yorick Peterse2018-04-102-4/+12
* | Merge branch 'revert-e9e800f5' into 'master'Marin Jankovski2018-04-104-104/+4
* | Merge branch 'fix-n-plus-one-when-getting-notification-settings-for-recipient...Yorick Peterse2018-04-1022-50/+188
* | Merge branch 'deploy-tokens-container-registry-specs' into 'master'Kamil Trzciński2018-04-105-12/+165
* | Merge branch 'gitlab-shell-7.1.2' into 'master'Douwe Maan2018-04-101-1/+1
* | Merge branch 'sh-fix-issue-45152' into 'master'Grzegorz Bizon2018-04-103-4/+16
* | Merge branch 'sh-handle-legacy-archive-requests' into 'master'Douwe Maan2018-04-102-2/+13
* | Merge remote-tracking branch 'origin/master' into 10-7-stable-prepare-rc310-7-stable-prepare-rc3James Lopez2018-04-09372-9913/+15665
|\ \ | |/ |/|
| * Merge branch 'winh-badges-docs' into 'master'Douwe Maan2018-04-086-3/+83
| |\
| | * Add user documentation for badgesWinnie Hellmann2018-04-086-3/+83
| |/
| * Merge branch 'winh-41174-projects-groups-badges-ui' into 'master'Douwe Maan2018-04-0846-13/+3021
| |\
| | * Projects and groups badges settings UIFrancisco Javier López2018-04-0846-13/+3021
| |/
| * Merge branch '31591-project-deploy-tokens-to-allow-permanent-access' into 'ma...Kamil Trzciński2018-04-0747-38/+1010
| |\
| | * Use proper auth_scope for deploy tokenKamil Trzciński2018-04-072-3/+3
| | * Handle limit for datetime attributes on MySQLMayra Cabrera2018-04-0612-55/+89
| | * Modifies index on DeployTokens to use idMayra Cabrera2018-04-062-2/+2
| | * Handles default expires_at date directly into DeployToken modelMayra Cabrera2018-04-066-7/+17
| | * Removes deploy tokens presenterMayra Cabrera2018-04-064-37/+2
| | * Addresses database commentsMayra Cabrera2018-04-0612-26/+50
| | * Fix form javascriptKamil Trzciński2018-04-064-19/+25
| | * Increase test suite around deploy tokens behaviorMayra Cabrera2018-04-0617-220/+144
| | * Fixes broken schema and minor changesMayra Cabrera2018-04-067-12/+11
| | * Get rid of Redis when dealing with deploy tokensKamil Trzciński2018-04-0611-87/+52
| | * Fix and optimise DB schemaKamil Trzciński2018-04-063-21/+19
| | * Include ProjectDeployTokensMayra Cabrera2018-04-0626-132/+197
| | * Support Deploy Tokens properly without hacking abilitiesKamil Trzciński2018-04-068-28/+43
| | * Addreses backend review suggestionsMayra Cabrera2018-04-0613-20/+74
| | * Removes logic from Jwt and handle different scenarios on Gitlab::AuthMayra Cabrera2018-04-067-71/+121
| | * Fix i18n on deploy_token viewsMayra Cabrera2018-04-067-25/+25
| | * Addreses frontend reviewMayra Cabrera2018-04-068-27/+27
| | * Add documentation for DeployTokenMayra Cabrera2018-04-065-4/+84
| | * Implement read_registry for DeployTokensMayra Cabrera2018-04-062-10/+40
| | * Address UX reviewMayra Cabrera2018-04-0612-50/+103
| | * Implement 'read_repo' for DeployTokensMayra Cabrera2018-04-067-19/+184
| | * Create barebones for DeploytokenMayra Cabrera2018-04-0627-1/+536
| * | Merge branch 'blackst0ne-bump-parser-2-5-0-5' into 'master'Stan Hu2018-04-072-4/+4
| |\ \ | | |/ | |/|
| | * Bump `parser` gem to 2.5.0.5blackst0ne-bump-parser-2-5-0-5blackst0ne2018-04-072-4/+4
| |/
| * Merge branch 'fix-dashboard-sorting' into 'master'Clement Ho2018-04-072-1/+6
| |\
| | * Fix dashboard sortingJoshua Lambert2018-04-062-1/+6
| |/
| * Merge branch 'sh-fix-recaptcha-test' into 'master'Stan Hu2018-04-062-4/+1
| |\
| | * Fix the reCAPTCHA spec failures by not rendering the widget in test modeStan Hu2018-04-062-4/+1
| * | Merge branch '42568-pipeline-empty-state' into 'master'Kamil Trzciński2018-04-0632-58/+513
| |\ \
| | * | Add missing trace artifacts to jobs in specMatija Čupić2018-04-061-2/+2
| | * | Merge branch 'master' into '42568-pipeline-empty-state'Kamil Trzciński2018-04-06341-3517/+25979
| | |\ \
| | * | | Put Erased empty state at the beginningMatija Čupić2018-04-051-3/+3
View Lorry Controller Status