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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Rollback to a set version instead of an arbitrary number of stepssh-improve-rollback-test	Stan Hu	2018-03-22	1	-1/+1
\| \| \| \| \| \| \|	The previously hard-coded value can fail when new migrations are introduced since multiple migrations may need to be rolled back atomically. Closes #40302
*	Merge branch 'ci-pipeline-commit-lookup' into 'master'	Kamil Trzciński	2018-03-22	3	-5/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use porcelain commit lookup method on CI::CreatePipelineService Closes charts/helm.gitlab.io#291 See merge request gitlab-org/gitlab-ce!17911
\| *	Use porcelain commit lookup method on CI::CreatePipelineServiceci-pipeline-commit-lookup	Alejandro Rodríguez	2018-03-22	3	-5/+10
\| \| \| \| \| \| \| \| \| \|	Before we were using a "plumbing" Gitlab::Git method that does not go through Gitaly migration checking.
* \|	Merge branch 'prettier-ignore' into 'master'	Mike Greiling	2018-03-22	2	-73/+57
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added prettierignore file Closes #44483 See merge request gitlab-org/gitlab-ce!17907
\| * \|	remove svg.config.js as it no longer exists	Mike Greiling	2018-03-22	1	-1/+1
\| \| \|
\| * \|	Added prettierignore fileprettier-ignore	Phil Hughes	2018-03-21	2	-73/+57
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #44483
* \| \|	Merge branch 'move-concatenate-module-plugin' into 'master'	Jacob Schatz	2018-03-22	1	-3/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable webpack scope hoisting in development See merge request gitlab-org/gitlab-ce!17942
\| * \| \|	enable scope hoisting only in produciton (it interferes with HMR)	Mike Greiling	2018-03-22	1	-3/+1
\| \| \| \|
* \| \| \|	Merge branch '44382-ui-breakdown-for-create-merge-request' into 'master'	Clement Ho	2018-03-22	3	-7/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI breakdown of message of the last pushed branch for Create merge request Closes #44382 See merge request gitlab-org/gitlab-ce!17821
\| * \| \| \|	Fix UI breakdown for Create merge request button	Takuya Noguchi	2018-03-23	3	-7/+9
\| \| \| \| \|
* \| \| \| \|	Merge branch '43273-fix-double-scrollbar-dropdowns' into 'master'	Jacob Schatz	2018-03-22	5	-4/+40
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Some dropdowns have two scroll bars." Closes #43273 See merge request gitlab-org/gitlab-ce!17665
\| * \| \| \| \|	Resolve "Some dropdowns have two scroll bars."	Dennis Tang	2018-03-22	5	-4/+40
\|/ / / / /
* \| \| \| \|	Merge branch '44365-fix-module-reloading' into 'master'	Robert Speicher	2018-03-22	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the other "A copy of ..." error for ReadOnly Closes #44365 See merge request gitlab-org/gitlab-ce!17935
\| * \| \| \|	Force Rails to not complain about reloading	Lin Jen-Shin	2018-03-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Same strategy with: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17810 See: https://stackoverflow.com/a/29710188/1992201 Frankly I don't really understand how this works and I don't really care either. However I tried it and it does the job. To try this, make sure you have pending migrations, and run the server, hit the site. It would tell you that there's pending migrations, and then run migrations, and then hit the site again. Without this patch, Rails would complain that "A copy of ...", with this patch, it works without problems.
* \| \| \| \|	Merge branch 'robots-help' into 'master'	Robert Speicher	2018-03-22	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the /help page in robots.txt Closes #44433 See merge request gitlab-org/gitlab-ce!17928
\| * \| \| \| \|	Add the /help page in robots.txtrobots-help	Achilleas Pipinellis	2018-03-22	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The /help page has docs which we don't want to be crawled as we prefer the docs website instead. Related https://gitlab.com/gitlab-org/gitlab-ce/issues/44433
* \| \| \| \| \|	Merge branch 'bw-tweak-migration-style-guide-docs' into 'master'	Robert Speicher	2018-03-22	1	-4/+12
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make a little more obvious what operations might need downtime or enhanced migration techniques See merge request gitlab-org/gitlab-ce!17927
\| * \| \| \| \|	make a little more obvious what operations might need downtime or enhanced ↵	Brett Walker	2018-03-22	1	-4/+12
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	migration techniques
* \| \| \| \|	Merge branch '44386-better-ux-for-long-name-branches' into 'master'	Phil Hughes	2018-03-22	3	-72/+95
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Poor UX with branch whose name is very long on Branches Closes #44386 See merge request gitlab-org/gitlab-ce!17832
\| * \| \| \| \|	UX re-design branch items with flexbox	Takuya Noguchi	2018-03-22	3	-72/+95
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'backport-4006-add-weight-indicator-to-issues-board' into 'master'	Clement Ho	2018-03-22	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport 4006 add weight indicator to issues board See merge request gitlab-org/gitlab-ce!17923
\| * \| \| \| \| \|	backport dependency import change in issue_card_inner.jsbackport-4006-add-weight-indicator-to-issues-board	Dennis Tang	2018-03-21	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch ↵	Clement Ho	2018-03-22	4	-25/+40
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'leipert-42037-long-instance-names-group-names-covers-namespace-dropdown' into 'master' Prevent overflow of long instance urls during Project creation Closes #42037 See merge request gitlab-org/gitlab-ce!17717
\| * \| \| \| \| \| \|	Prevent overflow of long instance urls during Project creation	Lukas Eipert	2018-03-22	4	-25/+40
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'latest-security-to-master-21-03-18' into 'master'	Douwe Maan	2018-03-22	48	-135/+543
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce latest security changes to `master` See merge request gitlab-org/gitlab-ce!17905
\| * \ \ \ \ \ \	Merge branch 'master' into 'latest-security-to-master-21-03-18'	James Lopez	2018-03-22	219	-1250/+2797
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile # Gemfile.lock
\| * \| \| \| \| \| \| \|	Fixing request options to allow_local_requests with DELETE verblatest-security-to-master-21-03-18	Francisco Javier López	2018-03-21	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Adapting mattermost to the new way of calling HTTP	Francisco Javier López	2018-03-21	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'	James Lopez	2018-03-21	9	-55/+134
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.6] Fix GitLab Auth0 integration signs in the wrong user See merge request gitlab/gitlabhq!2354
\| * \| \| \| \| \| \| \|	Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'	Douwe Maan	2018-03-21	39	-79/+408
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
* \| \| \| \| \| \| \| \|	Merge branch '44453-performance-bar-modalbox' into 'master'	Phil Hughes	2018-03-22	3	-2/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Performance bar modal box content overflows" Closes #44453 See merge request gitlab-org/gitlab-ce!17889
\| * \| \| \| \| \| \| \| \|	Fix class name	Filipa Lacerda	2018-03-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into '44453-performance-bar-modalbox'44453-performance-bar-modalbox	Phil Hughes	2018-03-22	217	-1250/+2795
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/performance_bar/components/detailed_metric.vue
\| * \| \| \| \| \| \| \| \| \|	Prevent column with smaller width in performance bar	Filipa Lacerda	2018-03-21	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 44453-performance-bar-modalbox	Filipa Lacerda	2018-03-21	155	-331/+9448
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Changes empty project avatar to identicon in the IDE Apply NestingDepth (level 5) (framework/dropdowns.scss) Strip any query string parameters from Location headers from lograge Added monitoring docs Resolve "Loss of input text on comments after preview" fixed ide_edit_button not existing Update spec import path for vue mount component helper remove JS for cookie toggle move confirm_danger_modal bindings directly into the only two pages that need it remove un-used IDE helper module fixed SCSS lint updated file references in specs Move IDE to CE Fix test failures with licensee 8.9 refactor ConfirmDangerModal into ES module Update licensee 8.7.0 -> 8.9 Update gettext_i18n_rails_js 1.2.0 -> 1.3
\| * \| \| \| \| \| \| \| \| \|	Adds a bigger width to the performance bar modal box and breaks the content	Filipa Lacerda	2018-03-20	3	-2/+14
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/cache-clear-image' into 'master'	Marcia Ramos	2018-03-22	2	-8/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add image for clearing the cache docs Closes gitlab-ee#4642 See merge request gitlab-org/gitlab-ce!17932
\| * \| \| \| \| \| \| \| \| \| \|	Add image for clearing the cache docs	Achilleas Pipinellis	2018-03-22	2	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/4642
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/remove-wiki-cache-clear' into 'master'	Sean McGivern	2018-03-22	1	-3/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove calls to clear_cache from Git::Wiki Closes gitaly#1095 See merge request gitlab-org/gitlab-ce!17914
\| * \| \| \| \| \| \| \| \| \| \|	Remove calls to clear_cache from Git::Wikifix/remove-wiki-cache-clear	Ahmad Sherif	2018-03-21	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They were probably added to compensate for tests shortcomings, but now they don't complain. Closes gitaly#1095
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ce-version-of-ee-4295' into 'master'	Achilleas Pipinellis	2018-03-22	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CI Jobs retry link See merge request gitlab-org/gitlab-ce!17913
\| * \| \| \| \| \| \| \| \| \| \|	Fix CI Jobs retry link	George Tsiolis	2018-03-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '37987-speed-up-pipeline-creation' into 'master'	Kamil Trzciński	2018-03-22	2	-1/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed Up Pipeline Creation See merge request gitlab-org/gitlab-ce!17443
\| * \| \| \| \| \| \| \| \| \| \|	Add inverse_of: :pipeline for pipeline.builds (#37987)37987-speed-up-pipeline-creation	Dylan Griffith	2018-03-21	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This appears to reduce the number of queries in pipeline creation of gitlab-ce's .gitlab-ci.yml by 92 This also means we now need to mock this ci yaml file properly in the test because otherwise the yaml_errors stay on the object and make all the pipelines failed.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'move-email-footer-info-to-single-line' into 'master'	Filipa Lacerda	2018-03-22	2	-7/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move email footer info to a single line See merge request gitlab-org/gitlab-ce!17916
\| * \| \| \| \| \| \| \| \| \| \| \|	Move email footer info to a single linemove-email-footer-info-to-single-line	Eric Eastwood	2018-03-21	2	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5031#note_64372406
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'performance-bar-position-fix' into 'master'	Filipa Lacerda	2018-03-22	8	-59/+61
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix performance bar spacing See merge request gitlab-org/gitlab-ce!17912
\| * \| \| \| \| \| \| \| \| \| \| \| \|	fixed karmaperformance-bar-position-fix	Phil Hughes	2018-03-21	1	-10/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	removed check for host	Phil Hughes	2018-03-21	4	-35/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changed wrapper to container with correct widths
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix performance bar spacing	Phil Hughes	2018-03-21	5	-16/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \|