Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix tree restorer specgitaly-mandatory-fetch-ref | Jacob Vosmaer | 2018-07-25 | 1 | -1/+1 |
* | fix specs | Jacob Vosmaer | 2018-07-25 | 2 | -6/+3 |
* | More Gitaly cleanup | Jacob Vosmaer | 2018-07-25 | 3 | -26/+10 |
* | Merge branch 'frozen-string-enable-app-presenters' into 'master' | Rémy Coutable | 2018-07-25 | 49 | -0/+101 |
|\ | |||||
| * | Enable frozen string in presenters and policiesrepo-forks/gitlab-ce-frozen-string-enable-app-presenters | gfyoung | 2018-07-24 | 49 | -0/+101 |
* | | Merge branch 'i18n-extract-app/views/layouts' into 'master' | Rémy Coutable | 2018-07-25 | 29 | -232/+371 |
|\ \ | |||||
| * | | i18n: externalize strings from 'app/views/layouts' | Tao Wang | 2018-07-23 | 29 | -232/+371 |
* | | | Merge branch 'sh-bump-html-pipeline-2.8.4' into 'master' | Rémy Coutable | 2018-07-25 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Bump html-pipeline to 2.8.4sh-bump-html-pipeline-2.8.4 | Stan Hu | 2018-07-24 | 1 | -1/+1 |
* | | | | Merge branch 'replace-all-snake-case-in-scss-variables' into 'master' | Phil Hughes | 2018-07-25 | 23 | -164/+163 |
|\ \ \ \ | |||||
| * | | | | Replace snake case in mixins and merge_conflicts variables | George Tsiolis | 2018-07-25 | 3 | -110/+109 |
| * | | | | Replace snake case in SCSS variables | George Tsiolis | 2018-07-25 | 20 | -54/+54 |
* | | | | | Merge branch 'sh-use-wiki-limit-parameter-gitaly' into 'master' | Sean McGivern | 2018-07-25 | 11 | -14/+105 |
|\ \ \ \ \ | |||||
| * | | | | | Use limit parameter to retrieve Wikis from Gitalysh-use-wiki-limit-parameter-gitaly | Stan Hu | 2018-07-24 | 11 | -14/+105 |
* | | | | | | Merge branch 'docs-fix-users-md-typo' into 'master' | Achilleas Pipinellis | 2018-07-25 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix missing ` in users.mdfix-users-md-typodocs-fix-users-md-typo | Lin Jen-Shin | 2018-07-24 | 1 | -2/+2 |
* | | | | | | | Merge branch 'replace-snake-case-css-classes' into 'master' | Phil Hughes | 2018-07-25 | 19 | -33/+36 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Replace author_link snake case in stylesheets, specs, and helpers | George Tsiolis | 2018-07-24 | 7 | -9/+14 |
| * | | | | | | | Replace author_link snake case in specs | George Tsiolis | 2018-07-24 | 6 | -13/+13 |
| * | | | | | | | Replace author_link snake case in vue components | George Tsiolis | 2018-07-24 | 4 | -4/+4 |
| * | | | | | | | Replace author_link snake case in stylesheets | George Tsiolis | 2018-07-24 | 6 | -7/+5 |
* | | | | | | | | Merge branch 'sh-add-frozen-literal-templates' into 'master' | Rémy Coutable | 2018-07-25 | 3 | -0/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add frozen_string_literal to migration templatessh-add-frozen-literal-templates | Stan Hu | 2018-07-24 | 3 | -0/+6 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'using-docker-build-docs' into 'master' | Achilleas Pipinellis | 2018-07-25 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Update doc/ci/docker/using_docker_build.md | Tobias Hernstig | 2018-07-25 | 1 | -4/+6 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'mk/add-example-output-for-check-task-docs' into 'master' | Stan Hu | 2018-07-24 | 1 | -0/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add example output for file integrity check | Michael Kozono | 2018-07-24 | 1 | -0/+39 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fix-gitlab-registry-ssl-redirect' into 'master' | Stan Hu | 2018-07-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix: redirect non-SSL request for gitlab registry to valid URL | jelhan | 2018-07-24 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'sh-revert-markdown-changes' into 'master' | Robert Speicher | 2018-07-24 | 3 | -1/+18 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fix slow Markdown rendering | Stan Hu | 2018-07-24 | 3 | -1/+18 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'osw-background-migrations-best-practice-doc' into 'master' | Yorick Peterse | 2018-07-24 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Add points regarding background migrations on huge tablesosw-background-migrations-best-practice-doc | Oswaldo Ferreira | 2018-07-24 | 1 | -0/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'docs/ha-etc-ssh-typo' into 'master' | Marcia Ramos | 2018-07-24 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Update gitlab.mddocs/ha-etc-ssh-typo | Davin Walker | 2018-07-24 | 1 | -0/+5 |
* | | | | | | Merge branch 'docs/pat-typo' into 'master' | Marcia Ramos | 2018-07-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Remove extra parenthesis in PAT docsdocs/pat-typo | Achilleas Pipinellis | 2018-07-24 | 1 | -1/+1 |
* | | | | | | Merge branch 'backport-gitlab-database' into 'master' | Rémy Coutable | 2018-07-24 | 2 | -0/+112 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Backport various EE changes to Gitlab::Databasebackport-gitlab-database | Yorick Peterse | 2018-07-24 | 2 | -0/+112 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'osw-49554-broken-master' into 'master' | Rémy Coutable | 2018-07-24 | 2 | -2/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Add :sidekiq group to cleanup redis in after callback | Oswaldo Ferreira | 2018-07-24 | 2 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge branch 'dz-refactor-object-store-settings' into 'master' | Rémy Coutable | 2018-07-24 | 3 | -23/+48 |
|\ \ \ \ \ | |||||
| * | | | | | Make ObjectStoreSettings use more explicit and add specsdz-refactor-object-store-settings | Dmitriy Zaporozhets | 2018-07-24 | 3 | -7/+37 |
| * | | | | | Create class responsible for default object store settings | Dmitriy Zaporozhets | 2018-07-23 | 2 | -24/+19 |
* | | | | | | Merge branch 'zj-backup-timeout' into 'master' | Rémy Coutable | 2018-07-24 | 3 | -4/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove timeouts for long running requests | Zeger-Jan van de Weg | 2018-07-24 | 3 | -4/+13 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'frozen-string-danger' into 'master' | Rémy Coutable | 2018-07-24 | 4 | -3/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add Dangerfile for frozen_string_literal | gfyoung | 2018-07-24 | 4 | -3/+35 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jxterry-private-profile' into 'master' | Douwe Maan | 2018-07-24 | 22 | -66/+312 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add an option to have a private profile on GitLab | JX Terry | 2018-07-24 | 22 | -66/+312 |
|/ / / / / / |