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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Set tree list accounting for already-opened files57668-create-file-from-url	Denys Mishunov	2019-04-04	6	-17/+249
\| \| \| \| \| \| \| \| \| \| \| \|	Since we can create files from URL now, this means that these files will not exist in the tree returned from API: they exist on the client only before the first commit. In order to still show the newly-created files in the tree, we should not override the tree, but merge the tree existing on the client and the one coming from API. Changelog entry Moved trees merging into mutation
*	Create a new file if URL references non-existent one	Denys Mishunov	2019-04-04	2	-0/+22
\|
*	Merge branch 'only-changes-docs-update' into 'master'	Evan Read	2019-04-04	1	-3/+27
\|\ \| \| \| \| \| \| \| \|	Add docs to `only:changes/except:changes` that discuss using regex in certain scenarios See merge request gitlab-org/gitlab-ce!26831
\| *	Add docs to `only:changes/except:changes` that discuss using regex in ↵	Said Masoud	2019-04-04	1	-3/+27
\|/ \| \| \|	certain scenarios
*	Merge branch 'da-fix-broken-master' into 'master'	Stan Hu	2019-04-04	1	-2/+4
\|\ \| \| \| \| \| \| \| \|	Fix broken spec for Merge request > Revert modal See merge request gitlab-org/gitlab-ce!26961
\| *	Fix broken spec for Merge request > Revert modal	Douglas Barbosa Alexandre	2019-04-03	1	-2/+4
\| \|
* \|	Merge branch 'docs-google_secure_ldap' into 'master'	Evan Read	2019-04-04	5	-0/+215
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for Google Secure LDAP See merge request gitlab-org/gitlab-ce!26064
\| * \|	Add documentation for Google Secure LDAPdocs-google_secure_ldap	Drew Blessing	2019-04-03	5	-0/+215
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As of 11.9 GitLab supports Google Secure LDAP for authentication and group sync. This documentation outlines how to configure the service. Rename file
* \| \|	Merge branch 'docs/refactor-pgloader' into 'master'	Evan Read	2019-04-04	1	-147/+139
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Clean up the mysql to postgres guide See merge request gitlab-org/gitlab-ce!24061
\| * \|	Clean up the mysql to postgres guidedocs/refactor-pgloader	Achilleas Pipinellis	2019-04-03	1	-147/+139
\| \|/ \| \| \| \| \| \| \| \|	This change refactors the pgloader instructions to have less headings and be more straightforward.
* \|	Merge branch '10879/fix-security-template-inclusion' into 'master'	Douglas Barbosa Alexandre	2019-04-04	1	-1/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Include DAST as dependent CI template See merge request gitlab-org/gitlab-ce!26956
\| * \|	Include DAST as dependent CI template	Lucas Charles	2019-04-04	1	-1/+3
\|/ /
* \|	Merge branch 'mk/add-mkozono-to-backend-codeowners' into 'master'	Douglas Barbosa Alexandre	2019-04-04	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add @mkozono to backend CODEOWNERS Closes gitlab-com/www-gitlab-com#3355 See merge request gitlab-org/gitlab-ce!26947
\| * \|	Add @mkozono to backend CODEOWNERSmk/add-mkozono-to-backend-codeowners	Michael Kozono	2019-04-03	1	-2/+2
\| \| \|
* \| \|	Merge branch 'xanf/gitlab-ce-move-project-tags' into 'master'	Clement Ho	2019-04-03	3	-4/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Project overview UI: Line break when there are multiple project tags" Closes #55650 See merge request gitlab-org/gitlab-ce!26797
\| * \| \|	Move topics to separate line in project overviewxanf/gitlab-ce-move-project-tags	Illya Klymov	2019-04-03	3	-4/+8
\| \| \| \|
* \| \| \|	Merge branch 'ee-feature-doc-fixes' into 'master'	Evan Read	2019-04-03	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor EE feature doc fixes See merge request gitlab-org/gitlab-ce!26900
\| * \| \| \|	Use correct `ifEE` variable name	Mark Florian	2019-04-03	1	-3/+3
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Presumably the `renderIfEE` is from an older edit.
* \| \| \|	Merge branch '29249-show-download-diff-even-when-merge-request-is-closed' ↵59323-legend-showing-nan-for-avg-max-when-they-are-fractional-quantities	Mike Greiling	2019-04-03	3	-42/+43
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Show download diff even when merge request is closed" Closes #29249 See merge request gitlab-org/gitlab-ce!26772
\| * \| \|	Show Download diff links in closed MRs29249-show-download-diff-even-when-merge-request-is-closed	Fatih Acet	2019-04-03	3	-42/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Download MR diffs links were only available for open MRs, however it may still be useful for closed MRs.
* \| \| \|	Merge branch 'fix-issues-time-counter' into 'master'	Annabel Dunstone Gray	2019-04-03	3	-6/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace 'x seconds ago' with 'just now' Closes #58425 See merge request gitlab-org/gitlab-ce!25992
\| * \| \| \|	Replace 'x seconds ago' with 'just now'	Sergiu Marton	2019-04-03	3	-6/+12
\|/ / / /
* \| \| \|	Merge branch '13784-validate-variables-for-masking' into 'master'	Clement Ho	2019-04-03	17	-50/+193
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Simple masking frontend - CE See merge request gitlab-org/gitlab-ce!26751
\| * \| \|	Remove duplicate environment selector dropdown13784-validate-variables-for-masking	mfluharty	2019-03-29	1	-2/+0
\| \| \| \|
\| * \| \|	Add control for variable value masking	mfluharty	2019-03-29	17	-50/+195
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show masked switch for each variable When toggled on, the variable value will be masked in runner logs Show warning message if the switch is on but the value is not maskable
* \| \| \|	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.