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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Re-use MR tabs styles to Epic tabsce-7327-add-roadmap-within-epic	Kushal Pandya	2019-04-04	1	-16/+22
\|
*	Merge branch '57662-api-updates-to-mr-and-pipeline' into 'master'	Kamil Trzciński	2019-04-04	7	-4/+65
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Expose pipeline in the related merge requests Closes #57662 See merge request gitlab-org/gitlab-ce!26367
\| *	Expose head pipeline in the related merge requests	Alexandru Croitor	2019-04-04	7	-4/+65
\|/ \| \| \| \| \| \| \| \|	Expose head pipeline for the MR in the api when requesting related merge requests for an issue and show a detailed status for the pipeline, which would include: details_path, favicon, group, icon, label, text, tooltip. https://gitlab.com/gitlab-org/gitlab-ce/issues/57662#note_152023412
*	Merge branch '60005-fix-swipe-divider' into 'master'	Phil Hughes	2019-04-04	2	-2/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix swipe diff divider Closes #60005 See merge request gitlab-org/gitlab-ce!26970
\| *	Move swipe diff border to the right	ftab	2019-04-04	2	-2/+8
\|/ \| \| \| \| \| \|	In the Vue image diff app, the border needs to be on the right because the new image comes in from the left. The old image diff app which is used in commits and compare views had the new image visible by default and hiding away from the left.
*	Merge branch 'winh-sidebar-todo' into 'master'	Phil Hughes	2019-04-04	2	-2/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Copy sidebar todo component from EE Closes gitlab-ee#9954 See merge request gitlab-org/gitlab-ce!26915
\| *	Copy sidebar todo component from EE	Winnie Hellmann	2019-04-04	2	-2/+9
\|/
*	Merge branch '59878-deduplicate-dependencies' into 'master'	Phil Hughes	2019-04-04	1	-17/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Deduplicate frontend dependencies Closes #59878 See merge request gitlab-org/gitlab-ce!26916
\| *	Deduplicate dependencies59878-deduplicate-dependencies	Lukas Eipert	2019-04-03	1	-17/+2
\| \|
* \|	Merge branch 'support-time-windows-api' into 'master'	James Lopez	2019-04-04	8	-14/+143
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Support time window parameters in additional metrics endpoint See merge request gitlab-org/gitlab-ce!26228
\| * \|	Specify time window for additional metrics apisupport-time-windows-api	syasonik	2019-04-03	8	-14/+143
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds support for start and end parameters in the #additional_metrics endpoint of the EnvironmentsController. start and end are meant to be unix timestamps, per the Prometheus API (as the consumer of this endpoint will eventually be transitioned to a prometheus endpoint). This functionality is behind the :metrics_time_window feature flag for development.
* \| \|	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