summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'revert-todos-epic' into 'master'11-1-stable-prepare-rc8Yorick Peterse2018-07-1130-640/+184
* Merge branch '48237-toggle-file-comments' into 'master'Phil Hughes2018-07-1114-92/+378
* Merge branch 'docs/cluster-permissions' into 'master'Marcia Ramos2018-07-111-2/+3
* Update VERSION to 11.1.0-rc7v11.1.0-rc7GitLab Release Tools Bot2018-07-111-1/+1
* Merge branch 'fix-conflicts-exception-for-submodules' into 'master'11-1-stable-prepare-rc7Rémy Coutable2018-07-114-15/+31
* Merge branch 'sh-fix-git-gc-error-handling' into 'master'Robert Speicher2018-07-112-2/+8
* Merge branch '48960-namespace-diff-module' into 'master'Tim Zallmann2018-07-1012-13/+18
* Merge branch '48970-markdown-wiki-help-incorrect-in-how-wiki-pages-are-render...Sean McGivern2018-07-101-2/+2
* Merge branch '48982-mr-refactor-improve-performance-by-setting-v-once' into '...Fatih Acet2018-07-105-29/+20
* Merge branch '48951-clean-up' into 'master'Phil Hughes2018-07-105-66/+56
* Merge branch 'rjh/doc-update-for-gitlab-pages' into 'master'Rémy Coutable2018-07-102-5/+31
* Merge branch 'use-correct-script-location' into 'master'Rémy Coutable2018-07-101-1/+1
* Merge branch 'revert-3755d828' into 'master'Phil Hughes2018-07-103-3/+3
* Merge branch 'docs/codequality' into 'master'Marcia Ramos2018-07-105-53/+59
* Update VERSION to 11.1.0-rc6v11.1.0-rc6GitLab Release Tools Bot2018-07-091-1/+1
* Merge branch 'jprovazn-upload-symlink' into 'master'Kamil Trzciński2018-07-094-3/+36
* Merge branch '48978-fix-helm-installation-on-cluster' into 'master'Kamil Trzciński2018-07-093-2/+7
* Merge branch 'docs-update-version-for-variables' into 'master'Marcia Ramos2018-07-091-2/+2
* Merge branch 'docs/kubernetes-tiller' into 'master'Marcia Ramos2018-07-091-0/+7
* Merge branch '48897-mr-refactor-parallel-and-diff-view-are-being-rendered-at-...Fatih Acet2018-07-091-2/+2
* Merge branch '48906-adding-a-diff-line-note-freezes-the-browser' into 'master'Fatih Acet2018-07-093-4/+12
* Merge branch '19468-doc_add_readme_when_creating_project' into 'master'Douwe Maan2018-07-092-0/+3
* Merge branch '49007-sast-fails-with-syntaxerror-in-scripts-frontend-prettier-...Tim Zallmann2018-07-091-2/+2
* Merge branch '48898-mr-refactor-performance-costs-of-main-element-with-v-if' ...Filipa Lacerda2018-07-097-33/+61
* Merge branch '11-1-update-licenses' into 'master'James Lopez2018-07-091-45/+39
* Merge branch '11-1-update-templates' into 'master'James Lopez2018-07-0925-37/+86
* Merge commit '96eb6fd33b5dfc4910d8bd93e697d6b6eb70b991' into 11-1-stable-prep...Alessio Caiazza2018-07-09261-2831/+5939
|\
| * 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
| * | Merge branch 'sh-add-missing-foreign-key-import-export-uploads' into 'master'James Lopez2018-07-071-0/+1
| |\ \
| | * | Add missing foreign key in import_export_uploadsStan Hu2018-07-061-0/+1
| | |/
| * | Merge branch '48670-application-settings-may-not-be-invalidated-if-migrations...Stan Hu2018-07-074-7/+9
| |\ \
| | * | Stop relying on migrations in the CacheableAttributes cache key and cache att...Rémy Coutable2018-07-054-7/+9
| * | | Merge branch 'bw-move-readonly-logic' into 'master'Stan Hu2018-07-073-33/+27
| |\ \ \
| | * | | Refactor rspec matchers in read_only_spec.rbBrett Walker2018-07-073-33/+27
| |/ / /
| * | | Merge branch 'redesign-mr-widget-info-pipeline' into 'master'Filipa Lacerda2018-07-0613-235/+449
| |\ \ \ | | |_|/ | |/| |
| | * | Redesign for mr widget info and pipelines sectionClement Ho2018-07-0613-235/+449
| |/ /
| * | Merge branch '46246-gitlab-project-export-should-use-object-storage' into 'ma...Sean McGivern2018-07-0631-46/+509
| |\ \
| | * | fix specJames Lopez2018-07-061-1/+0
| | * | fix permissionsJames Lopez2018-07-061-1/+2
| | * | Update Import/Export to use object storage (based on aa feature flag)James Lopez2018-07-0631-45/+508
| * | | Merge branch 'docs-update-eks-hostname' into 'master'Achilleas Pipinellis2018-07-061-1/+1
| |\ \ \
| | * | | remove extra tick for eks docsdanielgruesso2018-07-061-1/+1
| * | | | Merge branch 'bw-enable-commonmark-preview' into 'master'Sean McGivern2018-07-0634-35/+248
| |\ \ \ \ | | |/ / / | |/| | |