summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add todo commentsgitlab-git-dont-memoize-pathJacob Vosmaer2018-07-111-0/+2
|
* Remove Repository#path memoizationJacob Vosmaer2018-07-109-176/+105
|
* Merge branch '48978-fix-helm-installation-on-cluster' into 'master'Kamil Trzciński2018-07-093-2/+7
|\ | | | | | | | | | | | | Resolve "Installing Helm Tiller Failing" Closes #48978 See merge request gitlab-org/gitlab-ce!20471
| * Include wget in apk add commandMayra Cabrera2018-07-083-2/+7
| | | | | | | | Closes #48978
* | Merge branch 'gitaly-mandatory-20180704-jv' into 'master'Douwe Maan2018-07-095-171/+36
|\ \ | | | | | | | | | | | | | | | | | | Make blob and other RPC's mandatory Closes gitaly#331, gitaly#384, gitaly#446, and gitaly#383 See merge request gitlab-org/gitlab-ce!20378
| * | 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
|\ \ | | | | | | | | | | | | | | | | | | Remove gitaly_list_commits_by_oid, gitaly_commit_deltas, gitaly_create_repository flags Closes gitaly#593, gitaly#566, and gitaly#670 See merge request gitlab-org/gitlab-ce!20432
| * | 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 project Closes #19468 See merge request gitlab-org/gitlab-ce!20438
| * | | 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 mandatory Closes gitaly#528 and gitaly#222 See merge request gitlab-org/gitlab-ce!20424
| * | | 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 color of indent guide in Web IDE Closes #48931 See merge request gitlab-org/gitlab-ce!20425
| * | | | Updated colorPhil Hughes2018-07-061-1/+1
| | | | |
| * | | | Updated (color of indent guide in Web IDEPhil Hughes2018-07-061-0/+1
| | | | | | | | | | | | | | | | | | | | Closes #48931
* | | | | Merge branch '48906-adding-a-diff-line-note-freezes-the-browser' into 'master'Fatih Acet2018-07-093-4/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Adding a diff line note freezes the browser" Closes #48906 See merge request gitlab-org/gitlab-ce!20476
| * | | | | This updates only the actual new discussion and not the full tree , which ↵Tim Zallmann2018-07-093-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | leads to a very costly full rerender
* | | | | | Merge branch '11-1-update-licenses' into 'master'James Lopez2018-07-091-45/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [11.1.0] Update the dependencies license list See merge request gitlab-org/gitlab-ce!20487
| * | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | [11.1.0] Update .gitignore, .gitlab-ci.yml, and Dockerfile templates See merge request gitlab-org/gitlab-ce!20486
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add options to adjust signed url creation for Object Storage to use older signature if needed. See merge request gitlab-org/gitlab-ce!18719
| * | | | | | 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 ↵Richard J Hancock2018-05-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | not support V4 of the signature.
* | | | | | | Merge branch '48982-mr-refactor-improve-performance-by-setting-v-once' into ↵Fatih Acet2018-07-085-29/+20
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "MR Refactor: Improve performance by setting v-once" Closes #48982 See merge request gitlab-org/gitlab-ce!20468
| * | | | | | Resolve "MR Refactor: Improve performance by setting v-once"Tim Zallmann2018-07-085-29/+20
|/ / / / / /
* | | | | | Merge branch ↵Fatih Acet2018-07-081-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48897-mr-refactor-parallel-and-diff-view-are-being-rendered-at-the-same-time' into 'master' Resolve "MR refactor: parallel and diff view are being rendered at the same time" Closes #48897 See merge request gitlab-org/gitlab-ce!20440
| * | | | | 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.rb See merge request gitlab-org/gitlab-ce!20469
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve render performance of large wiki pages See merge request gitlab-org/gitlab-ce!20465
| * | | | | Add changelog entry for !20465Peter Leitzen2018-07-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Improve render performance of large wiki pagesPeter Leitzen2018-07-071-3/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Compile often used regexps only once outside of the loop. This commit improves the performance of large wiki pages with many, many references.
* | | | | Merge branch ↵Tim Zallmann2018-07-073-4/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor-upgrade' into 'master' Resolve "Node 6 and 7 compatibility broken by recent Monaco editor upgrade" Closes #48661 See merge request gitlab-org/gitlab-ce!20461
| * | | | | 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_uploads See merge request gitlab-org/gitlab-ce!20458
| * | | | | | Add missing foreign key in import_export_uploadsStan Hu2018-07-061-0/+1
| |/ / / / /
* | | | | | Merge branch ↵Stan Hu2018-07-074-7/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48670-application-settings-may-not-be-invalidated-if-migrations-are-run' into 'master' Resolve "Application settings may not be invalidated if migrations are run" Closes #48670 See merge request gitlab-org/gitlab-ce!20389
| * | | | | | Stop relying on migrations in the CacheableAttributes cache key and cache ↵Rémy Coutable2018-07-054-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attributes for 1 minute instead Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'bw-move-readonly-logic' into 'master'Stan Hu2018-07-073-33/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor rspec matchers in read_only_spec.rb See merge request gitlab-org/gitlab-ce!20414
| * | | | | | | 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 section Closes #46795 See merge request gitlab-org/gitlab-ce!20189
| * | | | | | Redesign for mr widget info and pipelines sectionClement Ho2018-07-0613-235/+449
|/ / / / / /
* | | | | | Merge branch '46246-gitlab-project-export-should-use-object-storage' into ↵Sean McGivern2018-07-0631-46/+509
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "GitLab Project export should use object storage" Closes #46246 See merge request gitlab-org/gitlab-ce!20105
| * | | | | | 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 docs See merge request gitlab-org/gitlab-ce!20453