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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix typo in `.gitlab-ci.yml` heading	Mathijs de Kruyf	2018-01-24	1	-1/+1
\|
*	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
\| * \| \| \| \| \|	Add .qa-project-deploy-keys to locate itqa-deploy-key-factory-product	Lin Jen-Shin	2018-01-20	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without this, it's very hard to locate it.
\| * \| \| \| \| \|	Scrap the deploy key title and match it in test	Lin Jen-Shin	2018-01-20	3	-10/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'tz-upgrade-jasmine-and-raven' into 'master'	Clement Ho	2018-01-23	7	-55/+32
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade jasmine + raven to newer versions See merge request gitlab-org/gitlab-ce!16573
\| * \| \| \| \| \| \| \| \| \| \|	Upgrade jasmine + raven to newer versions	Tim Zallmann	2018-01-23	7	-55/+32
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'vendor-10-4-auto-devops-template' into 'master'	Marin Jankovski	2018-01-23	1	-10/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vendor 10.4 Auto DevOps template See merge request gitlab-org/gitlab-ce!16639
\| * \| \| \| \| \| \| \| \| \| \|	Vendor 10.4 Auto DevOps templatevendor-10-4-auto-devops-template	bikebilly	2018-01-23	1	-10/+0
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'prevent-high-sierra-fork-crash' into 'master'	Grzegorz Bizon	2018-01-23	1	-0/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent Unicorn crashing in development on macOS See merge request gitlab-org/gitlab-ce!16649
\| * \| \| \| \| \| \| \| \| \| \| \|	Prevent Unicorn crashing in development on macOS	Jacob Vosmaer (GitLab)	2018-01-23	1	-0/+13
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-s3-digitalocean-howto-docs' into 'master'	Achilleas Pipinellis	2018-01-23	1	-0/+24
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document how to configure Fog with Digital Ocean Spaces Closes gitlab-ee#4419 See merge request gitlab-org/gitlab-ce!16597
\| * \| \| \| \| \| \| \| \| \| \| \|	Document how to configure Fog with Digital Ocean Spacessh-s3-digitalocean-howto-docs	Stan Hu	2018-01-19	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitlab-org/gitlab-ee#4419
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/update-rack-attack' into 'master'	Achilleas Pipinellis	2018-01-23	1	-13/+123
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rack attack docs See merge request gitlab-org/gitlab-ce!16328
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Update rack attack docs	Cindy Pallares 🦉	2018-01-23	1	-13/+123
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Fatih Acet	2018-01-23	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public' into 'master' Fix visibility of "Allow users to request access" option in public projects Closes #42022 See merge request gitlab-org/gitlab-ce!16485
\| * \| \| \| \| \| \| \| \| \| \| \| \|	add CHANGELOG.md entry for !1648542022-allow-users-to-request-access-not-visible-when-project-visibility-is-public	Mike Greiling	2018-01-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	display "allow users to request access option" in public projects	Mike Greiling	2018-01-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|