summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove progress bottom paddingch-gitlab-ui-progress-barClement Ho2018-07-241-2/+1
* Merge branch 'master' into ch-gitlab-ui-progress-barClement Ho2018-07-24155-189/+844
|\
| * Merge branch 'backport-gitlab-database' into 'master'Rémy Coutable2018-07-242-0/+112
| |\
| | * Backport various EE changes to Gitlab::Databasebackport-gitlab-databaseYorick Peterse2018-07-242-0/+112
| * | Merge branch 'osw-49554-broken-master' into 'master'Rémy Coutable2018-07-242-2/+2
| |\ \
| | * | Add :sidekiq group to cleanup redis in after callbackOswaldo Ferreira2018-07-242-2/+2
| |/ /
| * | Merge branch 'dz-refactor-object-store-settings' into 'master'Rémy Coutable2018-07-243-23/+48
| |\ \
| | * | Make ObjectStoreSettings use more explicit and add specsdz-refactor-object-store-settingsDmitriy Zaporozhets2018-07-243-7/+37
| | * | Create class responsible for default object store settingsDmitriy Zaporozhets2018-07-232-24/+19
| * | | Merge branch 'zj-backup-timeout' into 'master'Rémy Coutable2018-07-243-4/+13
| |\ \ \
| | * | | Remove timeouts for long running requestsZeger-Jan van de Weg2018-07-243-4/+13
| | | |/ | | |/|
| * | | Merge branch 'frozen-string-danger' into 'master'Rémy Coutable2018-07-244-3/+35
| |\ \ \
| | * | | Add Dangerfile for frozen_string_literalgfyoung2018-07-244-3/+35
| * | | | Merge branch 'jxterry-private-profile' into 'master'Douwe Maan2018-07-2422-66/+312
| |\ \ \ \
| | * | | | Add an option to have a private profile on GitLabJX Terry2018-07-2422-66/+312
| |/ / / /
| * | | | Merge branch 'zj-repo-cleanup-mandatory' into 'master'Douwe Maan2018-07-241-4/+2
| |\ \ \ \
| | * | | | Make repository cleanup mandatoryZeger-Jan van de Weg2018-07-241-4/+2
| | | |/ / | | |/| |
| * | | | Merge branch 'update-improve-issue-boards-links-to-docs' into 'master'Achilleas Pipinellis2018-07-241-2/+2
| |\ \ \ \
| | * | | | Update improve issue boards links to docs [ci skip]George Tsiolis2018-07-241-2/+2
| | | |/ / | | |/| |
| * | | | Merge branch '43011-typecast-markdownversion-prop-notesapp' into 'master'Phil Hughes2018-07-242-1/+6
| |\ \ \ \
| | * | | | Add changelog entry43011-typecast-markdownversion-prop-notesappKushal Pandya2018-07-241-0/+5
| | * | | | Use `parseInt` to convert markdownVersion into numberKushal Pandya2018-07-241-1/+1
| * | | | | Merge branch 'kp-stacked-progress-bar-decimal-places' into 'master'Phil Hughes2018-07-246-7/+56
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Add changelog entrykp-stacked-progress-bar-decimal-placesKushal Pandya2018-07-241-0/+5
| | * | | | Use `roundOffFloat` method to show decimal places in progressbarKushal Pandya2018-07-243-7/+12
| | * | | | Add `roundOffFloat` helper methodKushal Pandya2018-07-242-0/+39
| | |/ / /
| * | | | Merge branch 'docs-add-read_repository-description' into 'master'Achilleas Pipinellis2018-07-241-0/+1
| |\ \ \ \
| | * | | | adds read_repository scope descriptiondocs-add-read_repository-descriptionAlexander Tanayno2018-07-191-0/+1
| * | | | | Merge branch 'sh-bump-sanitize-4.6.6' into 'master'Rémy Coutable2018-07-244-5/+10
| |\ \ \ \ \
| | * | | | | Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performancesh-bump-sanitize-4.6.6Stan Hu2018-07-234-5/+10
| * | | | | | Merge branch 'frozen-string-enable-app-serializers' into 'master'Rémy Coutable2018-07-24100-8/+216
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Enable frozen string in app/serializers/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-serializersgfyoung2018-07-23100-8/+216
| * | | | | | Merge branch 'feature/add-docs-to-disable-listener' into 'master'Achilleas Pipinellis2018-07-241-23/+21
| |\ \ \ \ \ \
| | * | | | | | Add docs to disable proxy listenermaxmeyer2018-07-241-23/+21
| |/ / / / / /
| * | | | | | Merge branch 'revert-aeb3df17' into 'master'Achilleas Pipinellis2018-07-241-38/+0
| |\ \ \ \ \ \
| | * | | | | | Revert "Merge branch '2211-add-option-to-change-clone-path-docs' into 'master'"revert-aeb3df17Steve Azzopardi2018-07-161-38/+0
| * | | | | | | Merge branch 'docs-no-milestone-issues-api' into 'master'Sean McGivern2018-07-241-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Add `No+Milestone` for querying by milestonedocs-no-milestone-issues-apiVictor Wu2018-07-231-3/+3
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'gitaly-remove-fetch-ref' into 'master'Sean McGivern2018-07-242-0/+5
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Annotate Gitlab::Git::Repository#fetch_refJacob Vosmaer (GitLab)2018-07-242-0/+5
| |/ / / / / /
* | | | | | | Update to 1.0.4Clement Ho2018-07-243-5/+5
* | | | | | | Merge branch 'master' into ch-gitlab-ui-progress-barClement Ho2018-07-231018-3698/+7492
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'api-minimal-access-level' into 'master'Robert Speicher2018-07-2313-13/+119
| |\ \ \ \ \ \
| | * | | | | | Add changelog entry for api-minimal-access-levelMarko, Peter2018-07-231-0/+5
| | * | | | | | Add min_access_level filter to projects APIMarko, Peter2018-07-238-8/+71
| | * | | | | | Add min_access_level filter to groups APIMarko, Peter2018-07-234-5/+43
| * | | | | | | Merge branch 'tz-mr-refactor-mem-posting' into 'master'Fatih Acet2018-07-234-31/+18
| |\ \ \ \ \ \ \
| | * | | | | | | Improving performance of posting a comment by reducing memory + CPUTim Zallmann2018-07-234-31/+18
| |/ / / / / / /
| * | | | | | | Merge branch '6977-follow-up-from-ee-resolve-extract-ee-specific-files-lines-...Robert Speicher2018-07-231-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Use render instead of render_if_exists in app/views/projects/services/prometh...6977-follow-up-from-ee-resolve-extract-ee-specific-files-lines-for-some-platform-related-project-viewsRémy Coutable2018-07-231-1/+1
| | | |/ / / / | | |/| | | |