summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'replace-snake-case-css-classes' into 'master'Phil Hughes2018-07-2519-33/+36
|\
| * Replace author_link snake case in stylesheets, specs, and helpersGeorge Tsiolis2018-07-247-9/+14
| * Replace author_link snake case in specsGeorge Tsiolis2018-07-246-13/+13
| * Replace author_link snake case in vue componentsGeorge Tsiolis2018-07-244-4/+4
| * Replace author_link snake case in stylesheetsGeorge Tsiolis2018-07-246-7/+5
* | Merge branch 'sh-add-frozen-literal-templates' into 'master'Rémy Coutable2018-07-253-0/+6
|\ \
| * | Add frozen_string_literal to migration templatessh-add-frozen-literal-templatesStan Hu2018-07-243-0/+6
* | | Merge branch 'using-docker-build-docs' into 'master'Achilleas Pipinellis2018-07-251-4/+6
|\ \ \ | |/ / |/| |
| * | Update doc/ci/docker/using_docker_build.mdTobias Hernstig2018-07-251-4/+6
|/ /
* | Merge branch 'mk/add-example-output-for-check-task-docs' into 'master'Stan Hu2018-07-241-0/+39
|\ \
| * | Add example output for file integrity checkMichael Kozono2018-07-241-0/+39
* | | Merge branch 'fix-gitlab-registry-ssl-redirect' into 'master'Stan Hu2018-07-241-1/+1
|\ \ \ | |/ / |/| |
| * | Fix: redirect non-SSL request for gitlab registry to valid URLjelhan2018-07-241-1/+1
|/ /
* | Merge branch 'sh-revert-markdown-changes' into 'master'Robert Speicher2018-07-243-1/+18
|\ \
| * | Fix slow Markdown renderingStan Hu2018-07-243-1/+18
* | | Merge branch 'osw-background-migrations-best-practice-doc' into 'master'Yorick Peterse2018-07-241-0/+8
|\ \ \
| * | | Add points regarding background migrations on huge tablesosw-background-migrations-best-practice-docOswaldo Ferreira2018-07-241-0/+8
* | | | Merge branch 'docs/ha-etc-ssh-typo' into 'master'Marcia Ramos2018-07-241-0/+5
|\ \ \ \
| * | | | Update gitlab.mddocs/ha-etc-ssh-typoDavin Walker2018-07-241-0/+5
* | | | | Merge branch 'docs/pat-typo' into 'master'Marcia Ramos2018-07-241-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove extra parenthesis in PAT docsdocs/pat-typoAchilleas Pipinellis2018-07-241-1/+1
* | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |