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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Prefer local variables insteadqa-deploy-key-scenario	Lin Jen-Shin	2018-01-24	1	-4/+4
\|
*	Add an test for QA::Runtime::RSAKey	Lin Jen-Shin	2018-01-24	1	-0/+9
\|
*	Move initialize method later.	Lin Jen-Shin	2018-01-24	1	-3/+3
\|
*	Merge remote-tracking branch 'upstream/master' into qa-deploy-key-scenario	Lin Jen-Shin	2018-01-24	356	-4642/+6164
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (106 commits) Remove callback as we already update accordingly on services added missing imports correctly imports performance bar Added imports for dispatcher routes Make the exposing of the Application secret more explicit Add documentation about when the application API was added Add application create API Return a blank JSON response for a missing .js file to prevent Rails CSRF errors add CHANGELOG.md entry for !15804 disable CopyAsGFM on iOS due to bug in webkit Update changelog GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side Return more consistent values for merge_status on MR API Fix a migration spec messing up the MergeRequestDiff DB schema Backport changes to Gitlab::Checks::ChangeAccess from EE remove webpack bundle tag for monitoring:environments:metrics Set timezone for karma to UTC Upgrade jasmine + raven to newer versions Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the correct location Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze ...
\| *	Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'	Douwe Maan	2018-01-24	2	-1/+15
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return more consistent values for merge_status on V4 MR APIs Closes #20639 See merge request gitlab-org/gitlab-ce!16626
\| \| *	Remove callback as we already update accordingly on services	Oswaldo Ferreira	2018-01-24	2	-24/+0
\| \| \|
\| \| *	Update changelogosw-updates-merge-status-on-api-actions	Oswaldo Ferreira	2018-01-23	1	-1/+1
\| \| \|
\| \| *	Return more consistent values for merge_status on MR API	Oswaldo Ferreira	2018-01-23	4	-1/+39
\| \| \|
\| * \|	Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master'	Rémy Coutable	2018-01-24	6	-0/+165
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add application create API Closes #24035 See merge request gitlab-org/gitlab-ce!16643
\| \| * \|	Make the exposing of the Application secret more explicitPNSalocin/gitlab-ce-24035-api-create-application	Toon Claes	2018-01-24	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To make it more clear to developers that the entity exposes the application secret, define a separate entity that only should be used when the secret is needed (probably only on creation).
\| \| * \|	Add documentation about when the application API was added	Toon Claes	2018-01-24	2	-1/+6
\| \| \| \|
\| \| * \|	Add application create API	Nicolas MERELLI	2018-01-24	6	-0/+156
\| \| \| \|
\| * \| \|	Merge branch 'groups-webpack-bundle' into 'master'	Filipa Lacerda	2018-01-24	13	-19/+24
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added dispatcher imports for groups webpack bundle See merge request gitlab-org/gitlab-ce!16644
\| \| * \| \|	fixed paginationgroups-webpack-bundle	Phil Hughes	2018-01-23	1	-3/+1
\| \| \| \| \|
\| \| * \| \|	fixed group page specific JS	Phil Hughes	2018-01-23	1	-2/+0
\| \| \| \| \|
\| \| * \| \|	Added dispatcher imports for groups webpack bundle	Phil Hughes	2018-01-23	11	-16/+25
\| \| \| \| \|
\| * \| \| \|	Merge branch 'sh-fix-cross-site-forgery-errors' into 'master'	Rémy Coutable	2018-01-24	1	-0/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return a blank JSON response for a missing .js file to prevent Rails CSRF errors Closes #40771 See merge request gitlab-org/gitlab-ce!16664
\| \| * \| \| \|	Return a blank JSON response for a missing .js file to prevent Rails CSRF errorssh-fix-cross-site-forgery-errors	Stan Hu	2018-01-23	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The default 404 handler would return the Content-Type format based on the given format extension. This would cause the Rails CSRF protection to flag an error, since the .js extension gets mapped to text/javascript format. Closes #40771
\| * \| \| \| \|	Merge branch 'ph-even-more-dispatcher-imports' into 'master'	Filipa Lacerda	2018-01-24	5	-21/+13
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added imports for dispatcher routes See merge request gitlab-org/gitlab-ce!16640
\| \| * \| \| \| \|	added missing imports	Phil Hughes	2018-01-24	1	-0/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	correctly imports performance bar	Phil Hughes	2018-01-24	2	-4/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Added imports for dispatcher routes	Phil Hughes	2018-01-24	2	-17/+7
\| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'winh-axios-mock-restore' into 'master'	Filipa Lacerda	2018-01-24	10	-15/+15
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use restore() instead of reset() for removing axios MockAdapter See merge request gitlab-org/gitlab-ce!16647
\| \| * \| \| \| \|	Use restore() instead of reset() for removing axios MockAdapterwinh-axios-mock-restore	Winnie Hellmann	2018-01-23	10	-15/+15
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'rc/improve-setup-test-env' into 'master'	Grzegorz Bizon	2018-01-24	3	-5/+15
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed-up setup-test-env See merge request gitlab-org/gitlab-ce!16621
\| \| * \| \| \| \| \|	Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the ↵rc/improve-setup-test-env	Rémy Coutable	2018-01-23	3	-5/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	correct location Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Merge branch 'fix/gitaly-can-be-merged-for-missing-conflict-files' into 'master'	Grzegorz Bizon	2018-01-24	2	-1/+12
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side See merge request gitlab-org/gitlab-ce!16655
\| \| * \| \| \| \| \| \|	GitalyClient::ConflictsService#conflicts? should return true for conflicts ↵fix/gitaly-can-be-merged-for-missing-conflict-files	Ahmad Sherif	2018-01-23	2	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with missing side
\| * \| \| \| \| \| \| \|	Merge branch 'qa-deploy-key-factory-product' into 'master'	Grzegorz Bizon	2018-01-24	4	-11/+15
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Scrap the deploy key title and match it in test See merge request gitlab-org/gitlab-ce!16554
\| * \ \ \ \ \ \ \ \	Merge branch '32546-cannot-copy-paste-on-ios' into 'master'	Phil Hughes	2018-01-24	2	-0/+12
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Cannot copy/paste on iOS" Closes #32546 See merge request gitlab-org/gitlab-ce!15804
\| \| * \| \| \| \| \| \| \|	add CHANGELOG.md entry for !1580432546-cannot-copy-paste-on-ios	Mike Greiling	2018-01-24	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	disable CopyAsGFM on iOS due to bug in webkit	Mike Greiling	2018-01-24	1	-0/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '42251-explicit-timezone-for-karma' into 'master'	Mike Greiling	2018-01-23	2	-0/+7
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set timezone for karma CI job to Etc/UTC (UTC+0) Closes #42251 See merge request gitlab-org/gitlab-ce!16602
\| \| * \| \| \| \| \| \| \|	Set timezone for karma to UTC	Takuya Noguchi	2018-01-23	2	-0/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '42340-ci-failing-on-mergerequestdiff-commits_count' into 'master'	Stan Hu	2018-01-23	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "CI failing on MergeRequestDiff#commits_count=" Closes #42340 See merge request gitlab-org/gitlab-ce!16653
\| \| * \| \| \| \| \| \| \| \|	Fix a migration spec messing up the MergeRequestDiff DB schema42340-ci-failing-on-mergerequestdiff-commits_count	Rémy Coutable	2018-01-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'fix-gitlab-runner-2652' into 'master'	Kamil Trzciński	2018-01-23	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix docs for GIT_CHECKOUT Gitlab Runner configuration Closes gitlab-runner#2652 See merge request gitlab-org/gitlab-ce!16522
\| \| * \| \| \| \| \| \| \| \| \|	Fix docs for GIT_CHECKOUT Gitlab Runner configuration	Tom Elliff	2018-01-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Should fix https://gitlab.com/gitlab-org/gitlab-runner/issues/2652
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-push-rule-regexp-error-ce' into 'master'	Douwe Maan	2018-01-23	1	-17/+21
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes to Gitlab::Checks::ChangeAccess from EE See merge request gitlab-org/gitlab-ce!16652
\| \| * \| \| \| \| \| \| \| \| \|	Backport changes to Gitlab::Checks::ChangeAccess from EE	Douwe Maan	2018-01-23	1	-17/+21
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'dispatcher-milestones-show-path' into 'master'	Jacob Schatz	2018-01-23	4	-4/+22
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher milestones show path See merge request gitlab-org/gitlab-ce!16633
\| \| * \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher milestones show pathdispatcher-milestones-show-path	Clement Ho	2018-01-22	4	-4/+22
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'psimyn-webpack-bundle-env-metrics' into 'master'	Phil Hughes	2018-01-23	4	-3/+10
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove webpack bundle tag for monitoring:environments:metrics See merge request gitlab-org/gitlab-ce!16638
\| \| * \| \| \| \| \| \| \| \| \| \| \|	remove webpack bundle tag for monitoring:environments:metrics	Simon Knox	2018-01-23	4	-3/+10
\| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-process-feature-deadlines' into 'master'	Rémy Coutable	2018-01-23	1	-3/+27
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze See merge request gitlab-org/gitlab-ce!16650
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Clarify that a feature that isn't in review by the 1st or 3rd doesn't ↵	Douwe Maan	2018-01-23	1	-3/+27
\| \| \| \|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	necessarily miss the freeze
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/adjust-layout-width-for-fixed-layout' into 'master'	Phil Hughes	2018-01-23	10	-27/+31
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust layout width for fixed layout #41830 Closes #41830 See merge request gitlab-org/gitlab-ce!16337
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Adjust last push notification width	George Tsiolis	2018-01-23	10	-27/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dispatcher-new' into 'master'	Clement Ho	2018-01-23	3	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	consistent function exports for Labels edit/new pages See merge request gitlab-org/gitlab-ce!16635
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	consistent function exports for Labels edit/new pagesdispatcher-new	Simon Knox	2018-01-23	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|