delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move git calls for `Repository#update_branch` inside Gitlab::Gitce-update-branch-client-preparation	Alejandro Rodríguez	2018-06-25	1	-2/+5
\| \| \| \|	This prepares this code for migration to Gitaly.
*	Merge remote-tracking branch 'dev/master'	Alessio Caiazza	2018-06-25	2	-2/+3
\|\
\| *	Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master'	Alessio Caiazza	2018-06-25	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	[master] Fix xss for Markdown elements where [[_TOC_]] is enabled See merge request gitlab/gitlabhq!2400
\| \| *	Fix xss for Markdown elements where [[_TOC_]] is enabled	Mark Chao	2018-06-16	1	-1/+1
\| \| \|
\| * \|	Merge branch 'security-fj-bumping-sanitize-gem' into 'master'	Alessio Caiazza	2018-06-25	1	-1/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2399
\| \| * \	Merge branch 'master' into 'security-fj-bumping-sanitize-gem'	Douwe Maan	2018-06-18	7	-156/+39
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile.rails5.lock
\| \| * \| \|	Whitelist text-align property for th and td	Douwe Maan	2018-06-18	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Honor saml assurance level to allow 2FA bypassing	Roger Rüttimann	2018-06-25	4	-0/+27
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-create-from-bundle-mandatory' into 'master'	Douwe Maan	2018-06-25	1	-10/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves CreateFromBundle RPC to mandatory Closes gitaly#944 See merge request gitlab-org/gitlab-ce!20144
\| * \| \| \| \|	Moves another RPC to mandatory	Zeger-Jan van de Weg	2018-06-25	1	-10/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This specific one isn't used on most machines, therefor low risk. Closes https://gitlab.com/gitlab-org/gitaly/issues/944
* \| \| \| \| \|	Merge branch 'zj-is-anchestor' into 'master'	Douwe Maan	2018-06-25	2	-91/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ancestor check is Gitaly only now Closes gitaly#789 and gitaly#308 See merge request gitlab-org/gitlab-ce!20095
\| * \| \| \| \| \|	Update remote happens through Gitaly only	Zeger-Jan van de Weg	2018-06-25	1	-75/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change makes closes another migration! And remotes tests around it, mostly due to stubbing this was needed. Also, these are tested on the Gitaly side too: - https://gitlab.com/gitlab-org/gitaly/issues/791 - https://gitlab.com/gitlab-org/gitaly/blob/6dd74543f6af8ebcf22aa10e39da004f388fdda5/internal/service/repository/fetch_remote_test.go Closes https://gitlab.com/gitlab-org/gitaly/issues/789
\| * \| \| \| \| \|	Anchestor check is Gitaly only now	Zeger-Jan van de Weg	2018-06-25	1	-16/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/308
* \| \| \| \| \|	Merge branch 'zj-write-config' into 'master'	Douwe Maan	2018-06-25	1	-9/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Write Config is mandatory Closes gitaly#879 See merge request gitlab-org/gitlab-ce!20146
\| * \| \| \| \| \|	Write Config is mandatory	Zeger-Jan van de Weg	2018-06-25	1	-9/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/879
* \| \| \| \| \|	Merge branch 'zj-missing-part-linguist' into 'master'	Douwe Maan	2018-06-25	1	-23/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Languages feature gate See merge request gitlab-org/gitlab-ce!20128
\| * \| \| \| \| \|	Remove feature gatezj-missing-part-linguist	Zeger-Jan van de Weg	2018-06-25	1	-23/+2
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'zj-tree-entry-mandatory' into 'master'	Douwe Maan	2018-06-25	1	-87/+26
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly tree entry is mandatory Closes gitaly#310 See merge request gitlab-org/gitlab-ce!20099
\| * \| \| \| \| \|	Gitaly tree entry is mandatoryzj-tree-entry-mandatory	Zeger-Jan van de Weg	2018-06-25	1	-87/+26
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/310
* \| \| \| \| \|	Merge branch 'enforce-variable-value-to-be-a-string' into 'master'	Grzegorz Bizon	2018-06-25	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enforce setting string as value of the CI/CD variable Closes #48210 See merge request gitlab-org/gitlab-ce!20061
\| * \| \| \| \| \|	Enforce setting string as value of the CI/CD variable	Tomasz Maczukin	2018-06-25	1	-0/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jprovazn-rails5-mysql-datetime' into 'master'	Yorick Peterse	2018-06-25	1	-0/+18
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Fix MysqlDateTimeWithTimeZone in rails 5 Closes #46275 See merge request gitlab-org/gitlab-ce!19613
\| * \| \| \| \| \|	Mysql fixes for Rails 5jprovazn-rails5-mysql-datetime	Jan Provaznik	2018-06-21	1	-0/+18
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* `MysqlDateTimeWithTimeZone` inherits from `ActiveRecord::Type::DateTime` (`MysqlDateTime` is not present in Rails 5) * explicitly set `NULL` default value for `merge_request_diff_files`'s `diff` column (otherwise empty string is used in a migration) and empty string is not allowed for text/blob fields in Mysql * disable NO_ZERO_DATE mode for all Mysql DB connections, otherwise SQL queries fail on inserting `0` value for `created_at` column
* \| \| \| \| \|	Merge branch 'zj-commit-raw-diffs' into 'master'	Douwe Maan	2018-06-22	1	-7/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raw diffs are served from Gitaly Closes gitaly#222 See merge request gitlab-org/gitlab-ce!20091
\| * \| \| \| \| \|	Raw diffs are served from Gitalyzj-commit-raw-diffs	Zeger-Jan van de Weg	2018-06-22	1	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/222
* \| \| \| \| \| \|	Merge branch 'rs-lib-gitlab-git-gitlab_projects-parity' into 'master'	Robert Speicher	2018-06-22	1	-12/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE-EE parity for lib/gitlab/git/gitlab_projects.rb See merge request gitlab-org/gitlab-ce!20047
\| * \| \| \| \| \| \|	CE-EE parity for lib/gitlab/git/gitlab_projects.rbrs-lib-gitlab-git-gitlab_projects-parity	Robert Speicher	2018-06-20	1	-12/+13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'zj-find-ref-name' into 'master'	Douwe Maan	2018-06-22	1	-11/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FindRefName RPC now mandatory Closes gitaly#221 See merge request gitlab-org/gitlab-ce!20090
\| * \| \| \| \| \| \| \|	FindRefName RPC now mandatoryzj-find-ref-name	Zeger-Jan van de Weg	2018-06-22	1	-11/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Has never been in OPT_OUT, dispite being ages old. The time where feature flags are still set by env vars. Closes https://gitlab.com/gitlab-org/gitaly/issues/221
* \| \| \| \| \| \| \| \|	Merge branch 'bjk/48176_ruby_gc' into 'master'	Yorick Peterse	2018-06-22	1	-12/+14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ruby sampler metrics See merge request gitlab-org/gitlab-ce!20039
\| * \| \| \| \| \| \| \| \|	Cleanup ruby sampler metricsbjk/48176_ruby_gc	Ben Kochie	2018-06-22	1	-12/+14
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Use a simple counter for sampler duration instead of a histogram. * Use a counter to collect GC time. * Remove unused objects metric. * Cleanup metric names to match Prometheus conventions. * Prefix generic GC stats with `gc_stat`. * Include worker label on memory and file descriptor metrics.
* \| \| \| \| \| \| \| \|	Merge branch 'zj-repository-size' into 'master'	Douwe Maan	2018-06-22	1	-15/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repository size is Gitaly only Closes gitaly#393 See merge request gitlab-org/gitlab-ce!20089
\| * \| \| \| \| \| \| \| \|	Repository size is Gitaly onlyzj-repository-size	Zeger-Jan van de Weg	2018-06-22	1	-15/+1
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/393
* \| \| \| \| \| \| \| \|	Merge branch 'docs-request-cache' into 'master'	Sean McGivern	2018-06-22	1	-36/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for RequestCache Closes #48094 See merge request gitlab-org/gitlab-ce!20064
\| * \| \| \| \| \| \| \|	Add docs for RequestCache, moved from comments	Lin Jen-Shin	2018-06-22	1	-36/+1
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Git ls files is Gitaly only now	Zeger-Jan van de Weg	2018-06-22	1	-34/+1
\| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved to the front on the line through: https://gitlab.com/gitlab-org/gitlab-ce/issues/47893 Closes: https://gitlab.com/gitlab-org/gitlab-ce/issues/47893 Closes: https://gitlab.com/gitlab-org/gitaly/issues/327
* \| \| \| \| \| \|	Merge branch 'blackst0ne-fix-protect-from-forgery-in-application-controller' ↵	Douwe Maan	2018-06-22	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' [Rails5] Force the `protect_from_forgery` callback run first Closes #48204 See merge request gitlab-org/gitlab-ce!20055
\| * \| \| \| \| \|	[Rails5] Force the `protect_from_forgery` callback run firstblackst0ne-fix-protect-from-forgery-in-application-controller	blackst0ne	2018-06-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since Rails 5.0 the `protect_from_forgery` callback doesn't run first by default anymore. [1] Instead it gets inserted into callbacks chain where callbacks get called in order. This commit forces the callback to run first. [1]: https://github.com/rails/rails/commit/39794037817703575c35a75f1961b01b83791191
* \| \| \| \| \| \|	Merge branch 'restore-custom-hooks-wiki' into 'master'	Douwe Maan	2018-06-21	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore custom hooks for wiki See merge request gitlab-org/gitlab-ce!20065
\| * \| \| \| \| \| \|	Restore custom hooks for wikirestore-custom-hooks-wiki	Ahmad Hassan	2018-06-21	1	-0/+2
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Changes tab VUE refactoring	Felipe Artur	2018-06-21	3	-12/+60
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'da-usage-ping' into 'master'	Sean McGivern	2018-06-21	1	-8/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add enabled prefix to feature keys to be consistent with other keys See merge request gitlab-org/gitlab-ce!20043
\| * \| \| \| \| \|	Add enabled prefix to feature keys to be consistent with other keysda-usage-ping	Douglas Barbosa Alexandre	2018-06-20	1	-8/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Raw changes calculation is Gitaly only now	Zeger-Jan van de Weg	2018-06-21	1	-19/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/1138
* \| \| \| \| \| \|	Merge branch 'mk/fix-n-plus-1-queries-in-uploads-check-rake-task' into 'master'	Stan Hu	2018-06-20	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix N+1 queries in uploads check rake task Closes #47924 See merge request gitlab-org/gitlab-ce!20012
\| * \| \| \| \| \|	Avoid N+1 queries while processing uploads	Michael Kozono	2018-06-20	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'bvl-dont-generate-mo' into 'master'	Rubén Dávila	2018-06-20	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't generate `.mo` files Closes #47979 See merge request gitlab-org/gitlab-ce!20048
\| * \| \| \| \| \|	Don't generate `.mo` files	Bob Van Landuyt	2018-06-20	1	-1/+0
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we are only using `.po` files for translation we can shave off some setup time. Generating the `mo` files also regenerates the PO-files, including fuzzy translations. Those cause a lot of bugs, and we don't need them anymore since the `po` files are generated by an external translation service.
* \| \| \| \| \|	Merge branch 'unify-lib-tasks' into 'master'	Robert Speicher	2018-06-20	2	-2/+2
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify flay.rake and gettext.rake from EE See merge request gitlab-org/gitlab-ce!20041
\| * \| \| \| \|	Unify flay.rake and gettext.rake from EEunify-lib-tasks	Lin Jen-Shin	2018-06-21	2	-2/+2
\| \| \| \| \| \|