summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'docs/kubernetes-tiller' into 'master'fj-48043-instance-level-project-templatesMarcia Ramos2018-07-091-0/+7
|\
| * Add note about the k8s namespace of installed applicationsAchilleas Pipinellis2018-07-061-0/+7
* | Merge branch 'docs-update-version-for-variables' into 'master'Marcia Ramos2018-07-091-2/+2
|\ \
| * | updates version for CI_JOB_URL and CI_PIPELINE_URL to 11.1Alexander Tanayno2018-07-061-2/+2
* | | Merge branch '48898-mr-refactor-performance-costs-of-main-element-with-v-if' ...Filipa Lacerda2018-07-097-33/+61
|\ \ \
| * | | Resolve "MR refactor: Performance costs of main element with `v-if`"Tim Zallmann2018-07-097-33/+61
|/ / /
* | | Merge branch '48976-rails5-invalid-single-table-inheritance-type-group-is-not...Yorick Peterse2018-07-092-0/+8
|\ \ \
| * | | [Rails5] Fix 'Invalid single-table inheritance type: Group is not a subclass ...blackst0ne2018-07-072-0/+8
* | | | Merge branch 'docs/add-private-projects-public-access-note' into 'master'Achilleas Pipinellis (🌴 July 10 - July 20 🌴)2018-07-091-0/+6
|\ \ \ \
| * | | | Add documentation on private projectsCindy Pallares 🦉2018-07-091-0/+6
|/ / / /
* | | | Merge branch 'bvl-gettext-updated-check-fix-ce' into 'master'Sean McGivern2018-07-093-66/+123
|\ \ \ \
| * | | | Add missing strings to `locale/gitlab.pot`Bob Van Landuyt2018-07-091-48/+99
| * | | | Update `gettext:updated_check` regenerate pot fileBob Van Landuyt2018-07-092-18/+24
* | | | | Merge branch '49007-sast-fails-with-syntaxerror-in-scripts-frontend-prettier-...Tim Zallmann2018-07-091-2/+2
|\ \ \ \ \
| * | | | | Removed return statements from prettier scriptWinnie Hellmann2018-07-091-2/+2
* | | | | | Merge branch '48978-fix-helm-installation-on-cluster' into 'master'Kamil Trzciński2018-07-093-2/+7
|\ \ \ \ \ \
| * | | | | | Include wget in apk add commandMayra Cabrera2018-07-083-2/+7
* | | | | | | Merge branch 'gitaly-mandatory-20180704-jv' into 'master'Douwe Maan2018-07-095-171/+36
|\ \ \ \ \ \ \
| * | | | | | | Make blob and other RPC's mandatoryJacob Vosmaer (GitLab)2018-07-095-171/+36
|/ / / / / / /
* | | | | | | Merge branch 'gitaly-mandatory-20180706-jv' into 'master'Douwe Maan2018-07-094-77/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Make more things mandatoryJacob Vosmaer2018-07-064-77/+12
* | | | | | | Merge branch '19468-doc_add_readme_when_creating_project' into 'master'Douwe Maan2018-07-092-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Update doc on new option to add README when creating a projectImre Farkas2018-07-062-0/+3
| |/ / / / / /
* | | | | | | Merge branch 'gitaly-diff-mandatory' into 'master'Grzegorz Bizon2018-07-094-51/+27
|\ \ \ \ \ \ \
| * | | | | | | Make all Gitaly diff flags mandatoryJacob Vosmaer2018-07-064-51/+27
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'ide-indent-guide' into 'master'Filipa Lacerda2018-07-091-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Updated colorPhil Hughes2018-07-061-1/+1
| * | | | | | | Updated (color of indent guide in Web IDEPhil Hughes2018-07-061-0/+1
* | | | | | | | Merge branch '48906-adding-a-diff-line-note-freezes-the-browser' into 'master'Fatih Acet2018-07-093-4/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | This updates only the actual new discussion and not the full tree , which lea...Tim Zallmann2018-07-093-4/+12
* | | | | | | | | Merge branch '11-1-update-licenses' into 'master'James Lopez2018-07-091-45/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update the dependencies license list for 11.1.0Alessio Caiazza2018-07-091-45/+39
* | | | | | | | | | Merge branch '11-1-update-templates' into 'master'James Lopez2018-07-0925-37/+86
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update .gitignore, .gitlab-ci.yml, and Dockerfile templates for 11.1.0Alessio Caiazza2018-07-0925-37/+86
|/ / / / / / / / /
* | | | | | | | | Merge branch 'rjh/additional-options-for-s3-compatible-hosts' into 'master'Rémy Coutable2018-07-091-0/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Update gitlab.yml.exampleRichard Hancock2018-06-071-0/+1
| * | | | | | | | Correcting spelling mistake.Richard Hancock2018-05-041-1/+1
| * | | | | | | | Added options related to signed url creation to work with servcies that do no...Richard J Hancock2018-05-031-0/+4
* | | | | | | | | Merge branch '48982-mr-refactor-improve-performance-by-setting-v-once' into '...Fatih Acet2018-07-085-29/+20
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Resolve "MR Refactor: Improve performance by setting v-once"Tim Zallmann2018-07-085-29/+20
|/ / / / / / / /
* | | | | | | | Merge branch '48897-mr-refactor-parallel-and-diff-view-are-being-rendered-at-...Fatih Acet2018-07-081-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Changed Inline + Parallel Views to v-if instead of v-showTim Zallmann2018-07-071-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'test-basic-import' into 'master'Stan Hu2018-07-071-0/+0
|\ \ \ \ \ \ \
| * | | | | | | add basic export to fix timeout problem on import_file_spec.rbJames Lopez2018-07-071-0/+0
|/ / / / / / /
* | | | | | | Merge branch 'perf-wiki-pattern-once' into 'master'Stan Hu2018-07-072-3/+13
|\ \ \ \ \ \ \
| * | | | | | | Add changelog entry for !20465Peter Leitzen2018-07-071-0/+5
| * | | | | | | Improve render performance of large wiki pagesPeter Leitzen2018-07-071-3/+8
|/ / / / / / /
* | | | | | | Merge branch '48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor...Tim Zallmann2018-07-073-4/+9
|\ \ \ \ \ \ \
| * | | | | | | add CHANGELOG.md entry for !20461Mike Greiling2018-07-061-0/+5
| * | | | | | | resolve node 6 compatibility issuesMike Greiling2018-07-062-4/+4