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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Extract EE specific files/lines for Discussion spec/servicesce-issue_6628	Felipe Artur	2019-04-03	1	-23/+26
\| \| \| \|	This is part of moving GitLab to single codebase
*	Merge branch 'localize-notification-dropdown' into 'master'	Clement Ho	2019-04-03	3	-1/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Localize notifications dropdown Closes gitlab-ee#10686 See merge request gitlab-org/gitlab-ce!26844
\| *	Localize the notifications dropdown string	Jacques Erasmus	2019-04-03	3	-1/+10
\|/ \| \| \|	Localized the notifications dropdown string
*	Merge branch 'eric_theitguy-master-patch-89133' into 'master'	Achilleas Pipinellis	2019-04-03	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Removing redundant "predefined" See merge request gitlab-org/gitlab-ce!26516
\| *	Removing redundant "predefined"	Eric Hendricks	2019-04-03	1	-1/+1
\|/
*	Merge branch 'docs/fix-syntax-highlighting' into 'master'	Achilleas Pipinellis	2019-04-03	1	-7/+6
\|\ \| \| \| \| \| \| \| \|	Fix code block and other minor fixes See merge request gitlab-org/gitlab-ce!26894
\| *	Fix code block and other minor fixes	Evan Read	2019-04-03	1	-7/+6
\|/
*	Merge branch '58644-remove-reply_to_individual_notes-feature-flag' into 'master'	Nick Thomas	2019-04-03	7	-146/+36
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove reply_to_individual_notes feature flag Closes #58644 See merge request gitlab-org/gitlab-ce!26889
\| *	Remove reply_to_individual_notes feature flag58644-remove-reply_to_individual_notes-feature-flag	Heinrich Lee Yu	2019-04-03	7	-146/+36
\| \| \| \| \| \| \| \|	Also removes specs related to the flag
* \|	Update CHANGELOG.md for 11.9.5	GitLab Release Tools Bot	2019-04-03	5	-20/+13
\| \| \| \| \| \|	[ci skip]
* \|	Merge branch '10864-fix-undefined-with-fallback' into 'master'	Lin Jen-Shin	2019-04-03	1	-0/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Backport: Bring back Gitlab::UntrustedRegexp.with_fallback See merge request gitlab-org/gitlab-ce!26901
\| * \|	Bring back Gitlab::UntrustedRegexp.with_fallback10864-fix-undefined-with-fallback	Patrick Bajao	2019-04-03	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's still being called in PushRule model. Also still present in 11-9-stable-ee branch.
* \| \|	Merge branch 'docs-jest-debug' into 'master'	Fatih Acet	2019-04-03	2	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for debugging Jest tests See merge request gitlab-org/gitlab-ce!26810
\| * \| \|	Add docs for debugging Jest tests	Simon Knox	2019-04-03	2	-0/+5
\|/ / /
* \| \|	Merge branch '59942-fix-mr-swipe-diff-user-select' into 'master'	Phil Hughes	2019-04-03	2	-4/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MR image diff swipe view: Disable user-select on drag Closes #59942 See merge request gitlab-org/gitlab-ce!26884
\| * \| \|	MR image diff swipe view: Disable user-select on drag	ftab	2019-04-03	2	-4/+8
\|/ / / \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/59942
* \| \|	Merge branch 'remaining-lib-differences' into 'master'	Robert Speicher	2019-04-03	1	-0/+27
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve remaining CE to EE differences in lib/ See merge request gitlab-org/gitlab-ce!26608
\| * \| \|	Backport EE changes to gitlab:env:inforemaining-lib-differences	Yorick Peterse	2019-04-02	1	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This backports EE specific changes for the Rake task `gitlab:env:info`, wrapping them in a conditional. There is no way to inject code in the middle of a Rake task in EE, so unfortunately this is the best we can do.
* \| \| \|	Merge branch 'feature/webide_escaping' into 'master'	Nick Thomas	2019-04-03	5	-11/+36
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve file handling of special characters in WebIDE Closes #54376 See merge request gitlab-org/gitlab-ce!25727
\| * \| \| \|	Merge branch 'feature/webide_escaping' of gitlab.com:hiddentiger/gitlab-ce ↵	Kieran Andrews	2019-04-03	5	-11/+36
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	into feature/webide_escaping
* \| \| \|	Merge branch '52560-fix-duplicate-tag-system-hooks' into 'master'	Rémy Coutable	2019-04-03	3	-12/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only execute system hooks once when pushing tags Closes #52560 See merge request gitlab-org/gitlab-ce!26888
\| * \| \| \|	Only execute system hooks once when pushing tags	Nick Thomas	2019-04-03	3	-12/+19
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch '59756-shared-example-already-defined' into 'master'	Sean McGivern	2019-04-03	1	-85/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove already defined shared example Closes #59756 See merge request gitlab-org/gitlab-ce!26867
\| * \| \| \|	Remove already defined shared example59756-shared-example-already-defined	Alexandru Croitor	2019-04-02	1	-85/+0
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing the time traking shared example as it was actually moved under time_tracking_quick_action_shared_examples.rb filename to a different path as part of spec refactorign for quick action https://gitlab.com/gitlab-org/gitlab-ce/issues/50199 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26095
* \| \| \|	Merge branch 'ce-fj-10179-add-ports-to-web-ide-config' into 'master'	Kamil Trzciński	2019-04-03	26	-27/+997
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Backport: Update Web IDE config to accept ports Closes gitlab-ee#10179 See merge request gitlab-org/gitlab-ce!26679
\| * \| \| \|	Add port section to CI Image object	Francisco Javier López	2019-04-03	26	-27/+997
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to implement https://gitlab.com/gitlab-org/gitlab-ee/issues/10179 we need several modifications on the CI config file. We are adding a new ports section in the default Image object. Each of these ports will accept: number, protocol and name. By default this new configuration will be only enabled in the Web IDE config file.
* \| \| \|	Merge branch 'patch-50' into 'master'	Kamil Trzciński	2019-04-03	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs: add gitlab version for list jobs of a runner See merge request gitlab-org/gitlab-ce!26815
\| * \| \| \|	docs: add gitlab version for list jobs of a runner	jk2K	2019-04-01	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch '55268-exclude-system-notes-from-commits-in-mr' into 'master'	Rémy Coutable	2019-04-03	3	-9/+23
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not show system notes on commits in the MR page Closes #55268 See merge request gitlab-org/gitlab-ce!26396
\| * \| \| \| \|	Do not show system notes on commits in the MR page55268-exclude-system-notes-from-commits-in-mr	Heinrich Lee Yu	2019-04-02	3	-9/+23
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '47234-composable-auto-devops' into 'master'	Dmitriy Zaporozhets	2019-04-03	14	-915/+793
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Composable Auto DevOps" Closes #47234 See merge request gitlab-org/gitlab-ce!26520
\| * \| \| \| \| \|	Add required variables to Jobs/Build.gitlab-ci.yml47234-composable-auto-devops	Tiger	2019-04-02	2	-11/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add docs for including individual Auto-DevOps jobs	Tiger	2019-04-02	2	-0/+20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Split Security Auto DevOps jobs into templates	Tiger	2019-04-02	7	-253/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Container Scanning, Dependency Scanning, License Management and SAST parts of Auto DevOps now use the preexisting templates. Auto DevOps and the DAST job template will now use a shared job template instead of maintaining two copies of the job. This also allows Auto DevOps to use custom authentication with DAST.
\| * \| \| \| \| \|	Split non-security Auto-DevOps jobs into templates	Tiger	2019-04-02	6	-662/+678
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows these templates to be used outside of Auto DevOps, or easily excluded from Auto DevOps. The security jobs in Auto DevOps differ slightly from the ones that are already available as templates, they will be moved next.
* \| \| \| \| \| \|	Merge branch ↵	Evan Read	2019-04-03	1	-6/+23
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'59498-add-troubleshooting-section-to-capture-errors-with-installing-applications-to-a-kubernetes-cluster' into 'master' Resolve "Add troubleshooting section to capture errors with installing applications to a Kubernetes cluster" Closes #59498 See merge request gitlab-org/gitlab-ce!26639
\| * \| \| \| \| \| \|	Resolve "Add troubleshooting section to capture errors with installing ↵	Alexander Strachan	2019-04-03	1	-6/+23
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	applications to a Kubernetes cluster"
* \| \| \| \| \| \|	Merge branch '54621_missing_example' into 'master'	Grzegorz Bizon	2019-04-03	1	-0/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing 'export' example for CI_API_V4_API_URL See merge request gitlab-org/gitlab-ce!26878
\| * \| \| \| \| \| \|	Add missing 'export' example for CI_API_V4_API_URL	Olliver Schinagl	2019-04-02	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In issue #54621 a new variable CI_API_V4_API_URL was introduced, but some of the documentation was omitted. Having an example output is always nice. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
* \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2019-04-03	4	-4/+63
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-label' into 'master' Resolve "Quick Action Adds Multiple Labels to Issue If Middle Words Overlap with Existing Label" Closes #53459 See merge request gitlab-org/gitlab-ce!26602
\| * \| \| \| \| \| \| \|	Fix quick actions add label name middle word overlaps53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-label	Jacopo	2019-04-02	4	-4/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes quick actions add label when adding a label which name middle word overlaps with another label name: for example adding "A B C" when also label "B" exists. With the fix only the label "A B C" is correctly added, previously also the label "B" was added due to the middle word overlaps.
* \| \| \| \| \| \| \| \|	Merge branch 'ekigbo-extend-timezone-dropdown' into 'master'	Filipa Lacerda	2019-04-03	4	-26/+205
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extend timezone dropdown See merge request gitlab-org/gitlab-ce!26311
\| * \| \| \| \| \| \| \| \|	Extend timezone dropdown	Ezekiel Kigbo	2019-04-03	4	-26/+205
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds optional paramters to the constructor to allow reuse of the timezone dropdown on other pages
* \| \| \| \| \| \| \| \|	Merge branch 'fix-broken-master-release-permission-ce' into 'master'	Rémy Coutable	2019-04-03	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport: Fix Release permission spec See merge request gitlab-org/gitlab-ce!26897
\| * \| \| \| \| \| \| \| \|	Fix Release permission spec	Shinya Maeda	2019-04-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We recently changed the permission model to disallow guests to read Releases. The spec should be updated as well according to the expectation.
* \| \| \| \| \| \| \| \| \|	Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'	Filipa Lacerda	2019-04-03	4	-12/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes duplicate diff too large error messages Closes #59802 See merge request gitlab-org/gitlab-ce!26857
\| * \| \| \| \| \| \| \| \| \|	Fixes duplicate diff too large error messages	Phil Hughes	2019-04-02	4	-12/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'leipert-resolve-fe-dependency-conflict-ce' into 'master'	Filipa Lacerda	2019-04-03	2	-2/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE difference in FE dependency files See merge request gitlab-org/gitlab-ce!26856
\| * \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE difference in FE dependency filesleipert-resolve-fe-dependency-conflict-ce	Lukas Eipert	2019-04-02	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This resolved the one conflict we have in CE/EE.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'gl-set-up-gitlab-ui-danger-reviewer' into 'master'	Tim Zallmann	2019-04-03	3	-1/+59
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set specific reviewers for the GitLab UI WG effort See merge request gitlab-org/gitlab-ce!26760