summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix tree restorer specgitaly-mandatory-fetch-refJacob Vosmaer2018-07-251-1/+1
* fix specsJacob Vosmaer2018-07-252-6/+3
* More Gitaly cleanupJacob Vosmaer2018-07-253-26/+10
* Merge branch 'frozen-string-enable-app-presenters' into 'master'Rémy Coutable2018-07-2549-0/+101
|\
| * Enable frozen string in presenters and policiesrepo-forks/gitlab-ce-frozen-string-enable-app-presentersgfyoung2018-07-2449-0/+101
* | Merge branch 'i18n-extract-app/views/layouts' into 'master'Rémy Coutable2018-07-2529-232/+371
|\ \
| * | i18n: externalize strings from 'app/views/layouts'Tao Wang2018-07-2329-232/+371
* | | Merge branch 'sh-bump-html-pipeline-2.8.4' into 'master'Rémy Coutable2018-07-251-1/+1
|\ \ \
| * | | Bump html-pipeline to 2.8.4sh-bump-html-pipeline-2.8.4Stan Hu2018-07-241-1/+1
* | | | Merge branch 'replace-all-snake-case-in-scss-variables' into 'master'Phil Hughes2018-07-2523-164/+163
|\ \ \ \
| * | | | Replace snake case in mixins and merge_conflicts variablesGeorge Tsiolis2018-07-253-110/+109
| * | | | Replace snake case in SCSS variablesGeorge Tsiolis2018-07-2520-54/+54
* | | | | Merge branch 'sh-use-wiki-limit-parameter-gitaly' into 'master'Sean McGivern2018-07-2511-14/+105
|\ \ \ \ \
| * | | | | Use limit parameter to retrieve Wikis from Gitalysh-use-wiki-limit-parameter-gitalyStan Hu2018-07-2411-14/+105
* | | | | | Merge branch 'docs-fix-users-md-typo' into 'master'Achilleas Pipinellis2018-07-251-2/+2
|\ \ \ \ \ \
| * | | | | | Fix missing ` in users.mdfix-users-md-typodocs-fix-users-md-typoLin Jen-Shin2018-07-241-2/+2
* | | | | | | 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
|/ / / / / /