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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Refactor IssuableFinder to extract model-specific logicrefactor-issuable-finder-to-use-inheritance	Sean McGivern	2018-02-21	9	-78/+111
\| \| \| \| \| \| \| \| \|	By extracting a new `filter_items` method, we can override that in the IssuesFinder and MergeRequestsFinder separately, so we don't need checks that the model is the correct one, because we can just use the class we're in to know that. We can do the same for the VALID_PARAMS constant, by making it a class method.
*	Merge branch 'move-spintach-project-network-graph-to-rspec' into 'master'	Rémy Coutable	2018-02-20	3	-162/+108
\|\ \| \| \| \| \| \| \| \|	Move spinach project network graph tests to RSpec See merge request gitlab-org/gitlab-ce!17171
\| *	Move spinach project network graph tests to RSpec	Semyon Pupkov	2018-02-16	3	-162/+108
\| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \|	Merge branch 'remove-unnecessary-validate-project' into 'master'	Kamil Trzciński	2018-02-20	3	-3/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove unecessary validate: true from belongs_to :project See merge request gitlab-org/gitlab-ce!17166
\| * \|	Remove unecessary validate: true from belongs_to :projectremove-unnecessary-validate-project	Dylan Griffith	2018-02-20	3	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \|	This does not seem to serve any clear purpose and causes other issues (see https://gitlab.com/gitlab-org/gitlab-ce/issues/43196#note_59275652)
* \| \|	Merge branch 'remove-chart-show-bundle' into 'master'	Phil Hughes	2018-02-20	11	-29/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove graphs_show.js webpack bundle See merge request gitlab-org/gitlab-ce!17194
\| * \| \|	fix broken specsremove-chart-show-bundle	Mike Greiling	2018-02-19	4	-5/+5
\| \| \| \|
\| * \| \|	remove common_d3 bundle	Mike Greiling	2018-02-19	3	-15/+0
\| \| \| \|
\| * \| \|	remove graphs_show webpack bundle	Mike Greiling	2018-02-19	6	-9/+4
\| \| \| \|
* \| \| \|	Merge branch 'rs-over-testing' into 'master'	Rémy Coutable	2018-02-19	2	-50/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extraneous tests from Issues API spec Closes #25201 See merge request gitlab-org/gitlab-ce!17222
\| * \| \| \|	Remove extraneous tests from Issues API specrs-over-testing	Robert Speicher	2018-02-19	2	-50/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These were all testing an implementation detail of `Issues::UpdateService` which is already well-tested and doesn't need to be re-tested here. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25201
* \| \| \| \|	Merge branch 'docs/rs-changelog-doc-links' into 'master'	Rémy Coutable	2018-02-19	1	-2/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update two links in the changelog developer docs See merge request gitlab-org/gitlab-ce!17220
\| * \| \| \|	Update two links in the changelog developer docsdocs/rs-changelog-doc-links	Robert Speicher	2018-02-18	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'chart.html.haml-refactor' into 'master'43411-update-postgresql-ha-docs	Clement Ho	2018-02-19	37	-3533/+51
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Chart.html.haml refactor See merge request gitlab-org/gitlab-ce!16897
\| * \| \| \|	Chart.html.haml refactor	Jacob Schatz	2018-02-19	37	-3533/+51
\|/ / / /
* \| \| \|	Merge branch '4826-github-import-wiki-fix-1' into 'master'	Nick Thomas	2018-02-19	3	-2/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[GH Import] Create an empty wiki if wiki import failed Closes #43020 See merge request gitlab-org/gitlab-ce!17112
\| * \| \| \|	[GH Import] Create an empty wiki if wiki import failed	Valery Sizov	2018-02-19	3	-2/+12
\|/ / / /
* \| \| \|	Merge branch '42274-group-request-membership-long-too' into 'master'	Rémy Coutable	2018-02-19	5	-78/+114
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "group request membership mail with too long list of "To:"" Closes #42274 See merge request gitlab-org/gitlab-ce!17121
\| * \| \| \|	Resolve "group request membership mail with too long list of "To:""	🙈 jacopo beschi 🙉	2018-02-19	5	-78/+114
\|/ / / /
* \| \| \|	Merge branch 'kp-fix-stacked-bar-progress-value-clipping' into 'master'	Filipa Lacerda	2018-02-19	2	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix single digit value clipping for stacked progress bar Closes gitlab-ee#4864 See merge request gitlab-org/gitlab-ce!17217
\| * \| \| \|	Add changelog entrykp-fix-stacked-bar-progress-value-clipping	Kushal Pandya	2018-02-19	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Fix single digit value clipping	Kushal Pandya	2018-02-19	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'	Sean McGivern	2018-02-19	3	-5/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid slow File Lock checks when not used Closes #43339 See merge request gitlab-org/gitlab-ce!17140
\| * \| \| \|	Avoid slow File Lock checks when not used	James Edwards-Jones	2018-02-19	3	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also avoid double commit lookup during file lock check by reusing memoized commits.
* \| \| \| \|	Merge branch 'flipper-caching' into 'master'	Douwe Maan	2018-02-19	2	-1/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase feature flag cache TTL to one hour Closes #40854 See merge request gitlab-org/gitlab-ce!17213
\| * \| \| \| \|	Increase feature flag cache TTL to one hour	Yorick Peterse	2018-02-19	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Flipper already takes care of flushing cache entries when enabling/disabling features so it should be safe to increase the TTL. This in turn should drastically reduce the number of Flipper queries executed. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/40854
* \| \| \| \| \|	Merge branch 'qa/gb/fix-tests-for-hidden-secret-variables' into 'master'	Rémy Coutable	2018-02-19	5	-40/+34
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix and simplify end-to-end tests for secret variables Closes gitlab-qa#190 See merge request gitlab-org/gitlab-ce!17173
\| * \| \| \| \|	Remove useless assignment in secret variables specsqa/gb/fix-tests-for-hidden-secret-variables	Grzegorz Bizon	2018-02-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix and simplify end-to-end tests for secret variables	Grzegorz Bizon	2018-02-16	5	-39/+33
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch '32564-fix-double-system-closing-notes' into 'master'	Sean McGivern	2018-02-19	5	-25/+51
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Double closing system notes when closing issue with Merge Request" Closes #32546 and #32564 See merge request gitlab-org/gitlab-ce!17035
\| * \| \| \| \|	Convert Gitaly commit parent IDs to array as early as possible	Sean McGivern	2018-02-19	1	-10/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The tracking issue if this causes problems is https://gitlab.com/gitlab-org/gitaly/issues/1028
\| * \| \| \| \|	applying feedback32564-fix-double-system-closing-notes	Micaël Bergeron	2018-02-16	3	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# modified: lib/gitlab/git/commit.rb
\| * \| \| \| \|	fix specs	Micaël Bergeron	2018-02-16	2	-13/+18
\| \| \| \| \| \|
\| * \| \| \| \|	add changelog	Micaël Bergeron	2018-02-16	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	stop ProcessCommitWorker from processing MR merge commit	Micaël Bergeron	2018-02-16	3	-17/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a merge request is merged, it creates a commit with the description of the MR, which may contain references and issue closing references. As this will be handled in the PostMergeService anyways, let's ignore merge commit generated from a MR.
* \| \| \| \| \|	Merge branch 'sh-guard-read-only-user-updates' into 'master'	Nick Thomas	2018-02-19	3	-0/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't attempt to update user tracked fields if database is in read-only Closes gitlab-ee#4972 See merge request gitlab-org/gitlab-ce!17200
\| * \| \| \| \| \|	Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updates	Stan Hu	2018-02-17	3	-0/+15
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With Geo, attempting to view an endpoint with a user could result in an Error 500 since Devise attempts to update the last sign-in IP and other details. Closes gitlab-org/gitlab-ee#4972
* \| \| \| \| \|	Merge branch 'docs-articles-layout-frontmatter' into 'master'	Achilleas Pipinellis	2018-02-19	11	-63/+90
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Update all articles with the new layout (metadata from the frontmatter) Closes #42831 See merge request gitlab-org/gitlab-ce!17187
\| * \| \| \| \| \|	Update all articles with the new layout (meta data from the frontmatter)docs-articles-layout-frontmatter	Marcia Ramos	2018-02-16	11	-63/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Context: https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/182
* \| \| \| \| \| \|	Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'	Sean McGivern	2018-02-19	3	-0/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix squash rebase not working when diff contained encoded data Closes gitlab-ee#4960 See merge request gitlab-org/gitlab-ce!17205
\| * \| \| \| \| \| \|	Clarify changelog for squash encoding fix	Sean McGivern	2018-02-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Fix squash rebase not working when diff contained encoded datash-fix-squash-rebase-utf8-data	Stan Hu	2018-02-18	3	-0/+18
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the applied diff contains UTF-8 or some other encoded data, the diff returned back from the git process may be in ASCII-8BIT format. Writing this data to stdin may fail if the data because stdin expects this data to be in UTF-8. By switching the output to binmode, we ensure that the diff will always be written as-is. Closes gitlab-org/gitlab-ee#4960
* \| \| \| \| \| \|	Merge branch 'ee-webpack-backport' into 'master'	Filipa Lacerda	2018-02-19	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport webpack.config.js changes from EE See merge request gitlab-org/gitlab-ce!17185
\| * \| \| \| \| \| \|	Backport webpack.config.js changes from EEee-webpack-backport	Phil Hughes	2018-02-16	1	-2/+2
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'	Douwe Maan	2018-02-19	3	-2/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when viewing a commit with a GPG signature in Geo Closes gitlab-ee#4825 See merge request gitlab-org/gitlab-ce!17207
\| * \| \| \| \| \| \|	Fix Error 500 when viewing a commit with a GPG signature in Geo	Stan Hu	2018-02-19	3	-2/+33
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitlab-org/gitlab-ee#4825
* \| \| \| \| \| \|	Merge branch '41949-move' into 'master'	Douwe Maan	2018-02-19	3	-1/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remember assignee when moving an issue See merge request gitlab-org/gitlab-ce!17116
\| * \| \| \| \| \| \|	Remember assignee when moving an issue41949-move	Jan Provaznik	2018-02-18	3	-1/+29
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related to #41949
* \| \| \| \| \| \|	Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵	Douwe Maan	2018-02-19	8	-43/+213
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!17138
\| * \| \| \| \| \|	Validate SSH keys through the sshkey gemrd-40552-gitlab-should-check-if-keys-are-valid-before-saving	Rubén Dávila	2018-02-16	6	-45/+119
\| \| \| \| \| \| \|