summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-mk-exclude-orphaned-upload-files-from-export-11-0' int...José Iván Vargas López2018-08-241-3/+21
* Merge branch 'security-49085-11.0-persistent-xss-rendering' into 'security-11-0'José Iván Vargas López2018-08-242-2/+2
* Merge branch 'sh-block-link-local-master-11-0-port' into 'security-11-0'Nick Thomas2018-08-241-0/+8
* Merge branch 'security-2694-pipeline-11-0' into 'security-11-0'José Iván Vargas López2018-08-241-1/+1
* Merge branch 'security-security-event-counters-private-data-11-0' into 'secur...Alessio Caiazza2018-07-246-21/+3
* Merge branch 'sh-fix-issue-49133-11-0-stable' into 'security-11-0'Dmitriy Zaporozhets2018-07-171-1/+2
* Merge branch 'sh-fix-move-issue-with-object-storage' into 'master'Robert Speicher2018-07-041-19/+3
* Merge branch 'dm-favicon-asset-host' into 'master'Sean McGivern2018-07-042-6/+3
* Merge branch '48269-wiki-page-returns-error-code-502' into 'master'Douwe Maan2018-06-261-2/+4
* Merge branch 'mk/fix-n-plus-1-queries-in-uploads-check-rake-task' into 'master'11-0-stable-patch-2Stan Hu2018-06-251-1/+1
* Merge branch 'mk/rake-task-verify-remote-files' into 'master'Stan Hu2018-06-255-16/+79
* Merge branch '11-0-stable' into 11-0-stable-patch-2Mayra Cabrera2018-06-252-2/+3
|\
| * Merge branch 'security-fj-bumping-sanitize-gem-11-0' into 'security-11-0'Mayra Cabrera2018-06-211-1/+2
| * Merge branch 'security-2682-fix-xss-for-markdown-toc-11-0' into 'security-11-0'Mayra Cabrera2018-06-211-1/+1
* | Merge branch 'enforce-variable-value-to-be-a-string' into 'master'Grzegorz Bizon2018-06-251-0/+3
* | [11.0] Notify only merge request unmergeable due to conflictMark Chao2018-06-251-1/+5
* | Merge branch 'restore-custom-hooks-wiki' into 'master'Douwe Maan2018-06-251-0/+2
* | Merge branch 'bvl-dont-generate-mo' into 'master'Rubén Dávila2018-06-251-1/+0
* | Merge branch '48126-fix-prometheus-installation' into 'master'Kamil Trzciński (Conference till 20th)2018-06-251-3/+8
* | Merge branch 'fix/favicon-cross-origin' into 'master'Douwe Maan2018-06-251-5/+15
|/
* Revert "Merge branch 'mk/rake-task-verify-remote-files' into 'master'"11-0-stable-prepare-rc14-revert-19501Chris Peressini2018-06-195-79/+16
* Merge branch 'mk/rake-task-verify-remote-files' into 'master'Stan Hu2018-06-195-16/+79
* Merge branch 'optimise-paused-runners' into 'master'Stan Hu2018-06-191-1/+5
* Merge branch 'dm-favicon-redirect' into 'master'Sean McGivern2018-06-181-0/+1
* Merge branch 'dm-remove-favicon-main-version' into 'master'Robert Speicher2018-06-181-1/+1
* Merge branch '47825-gitaly-modal' into 'master'Clement Ho2018-06-151-1/+1
* Merge branch 'sql-buckets' into 'master'Stan Hu2018-06-142-2/+2
* Merge branch '47735-milestone-regression' into 'master'Phil Hughes2018-06-133-1/+7
* Merge branch 'fj-restore-users-v3-endpoint' into 'master'Douwe Maan2018-06-131-11/+15
* Merge branch 'fj-relax-url-validator-rules-for-user' into 'master'Douwe Maan2018-06-121-2/+2
* Merge branch 'sh-expire-content-cache-after-import' into 'master'Mayra Cabrera2018-06-112-3/+1
* Merge branch 'introduce-job-keep-alive-api-endpoint' into 'master'Tomasz Maczukin2018-06-072-2/+9
|\
| * Change update entrypoint instead of adding new keep-alive oneTomasz Maczukin2018-06-072-18/+9
| * Introduce new keep-alive API entrypoint for CI jobTomasz Maczukin2018-06-071-0/+16
* | Merge branch 'add-new-arg-to-git-rev-list-call' into 'master'Douwe Maan2018-06-072-6/+23
|\ \
| * | Pass the --in-commit-order arg to `git-rev-list`Rubén Dávila2018-06-072-6/+23
* | | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-072-1/+48
|\ \ \
| * | | dry up asset path helper callsAlexis Reigel2018-06-051-3/+10
| * | | the '?' favicon hack doesn't seem to be requiredAlexis Reigel2018-06-051-8/+1
| * | | remove favicon preview on appearance pageAlexis Reigel2018-06-051-6/+0
| * | | remove all .ico favicon variations, use png alwaysAlexis Reigel2018-06-052-6/+5
| * | | create favicon overlay on the clientAlexis Reigel2018-06-051-12/+21
| * | | call Gitlab::Favicon.status in serializerAlexis Reigel2018-06-059-15/+18
| * | | add request store caching to faviconAlexis Reigel2018-06-051-1/+1
| * | | Add a '?' to the custom favicon's urlsAlexis Reigel2018-06-051-2/+9
| * | | use custom favicon for ci build status faviconsAlexis Reigel2018-06-059-11/+23
| * | | extract favicon logic to lib classAlexis Reigel2018-06-051-0/+23
* | | | Merge branch 'sh-fix-schema-migrations-seq-scans' into 'master'Douwe Maan2018-06-071-0/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Make Gitlab::CurrentSettings.current_application_settings return cached setti...Rémy Coutable2018-06-071-2/+4
| * | | Avoid sequential scans loading schema_migrations table when loading applicati...Stan Hu2018-06-071-0/+13