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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Converted pipeline_schedules bundles into automatic webpack entriespipeline-schedule-webpack	Phil Hughes	2018-02-15	11	-7/+19
\| \| \| \|	#41341
*	Merge branch '35530-teleporting-emoji-fix' into 'master'	Fatih Acet	2018-02-15	1	-3/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix teleporting emoji (MR description instead of comment) Closes #35530 See merge request gitlab-org/gitlab-ce!17100
\| *	Don't reset the awards block when the emoji search is clicked	Jared Deckard	2018-02-07	1	-3/+1
\| \|
* \|	Merge branch '34130-null-pipes' into 'master'	Fatih Acet	2018-02-15	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Merge request says "Could not connect to the CI server", no CI or integration is configured" See merge request gitlab-org/gitlab-ce!17053
\| * \|	Prevent MR Widget error when no CI configured34130-null-pipes	Simon Knox	2018-02-12	1	-0/+1
\| \| \|
* \| \|	Merge branch 'fl-mr-widget-4' into 'master'	Tim Zallmann	2018-02-14	5	-39/+51
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves mr widget components into vue files See merge request gitlab-org/gitlab-ce!17110
\| * \| \|	Moves mr widget components into vue filesfl-mr-widget-4	Filipa Lacerda	2018-02-13	5	-39/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds i18n Improves test cases
* \| \| \|	Merge branch 'remove-unused-code-profile' into 'master'	Jacob Schatz	2018-02-13	1	-18/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Remove unused code in profile.js See merge request gitlab-org/gitlab-ce!17009
\| * \| \|	Remove unused coderemove-unused-code-profile	Clement Ho	2018-02-08	1	-18/+0
\| \| \| \|
* \| \| \|	Merge branch '43198-fix-settings-panel-expanding-when-fragment-hash-linked' ↵	Phil Hughes	2018-02-13	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix settings panels not expanding when fragment hash linked Closes #43198 See merge request gitlab-org/gitlab-ce!17074
\| * \| \| \|	Fix settings panel not expanding when fragment hash linked	Eric Eastwood	2018-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/43198
* \| \| \| \|	Make Edit link style consistent on Sidebar42580-fix-lock-mr-hover-on-edit	André Luís	2018-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Especially making the link on Lock MR section work the same as others on hover
* \| \| \| \|	Merge branch '42923-close-issue' into 'master'	Phil Hughes	2018-02-13	9	-49/+140
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Can't close issue through buttons in the textarea on mobile" Closes #42923 See merge request gitlab-org/gitlab-ce!17043
\| * \ \ \ \	[ci skip] Merge branch 'master' into 42923-close-issue	Filipa Lacerda	2018-02-13	15	-141/+125
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (25 commits) Addressed mr observations Clean new Flash() and stop disabling no-new (eslint) when possible Disable query limiting warnings for now on GitLab.com Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'" Fix warning messages for promoting labels and milestones Fixed missing js selector for the realtime pipelines commit comp Honour workhorse provided file name Create an empty wiki when there is no wiki in the gitlab export bundle Revert and remove header_title line from labels issue Fixed bug with param config changed params passed to from a string to an object Move IssuableTimeTracker vue component Fix breadcrumb on labels page for groups Convert groups_select ajax to use axios Default CI variables to unprotected make sure there is a dependency on Gitlab::CurrentSettings is Make GITLAB_FEATURES in build_spec compatible with EE Update jquery.waitforimages & use npm version Fixed typo, updated test, and removed commented code Replaced use of $.get with axios.get and updated tests ...
\| * \| \| \| \| \|	Reuse getter42923-close-issue	Filipa Lacerda	2018-02-12	4	-20/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add loading button for better UX
\| * \| \| \| \| \|	[ci skip] Merge branch 'master' into 42923-close-issue	Filipa Lacerda	2018-02-12	6	-117/+86
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (21 commits) GitLab QA: Add GITLAB_USER_TYPE to support different login types (e.g. standard, LDAP) Return a warning string if we try to encode to unsupported encoding Remove confirmation_input Resolve failures in GitHub-ish import controller specs Remove changelogs for already-released security patches Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4' Merge branch 'fix/gh-namespace-issue' into 'security-10-4' Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'security-10-4' Merge branch 'fix-mermaid-xss' into 'security-10-4' Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4' API - fix searching in group/project specified by path Add documentation on how to build a QA Docker image Fix english in style_guide_js.md Adds tooltip for environment name Adds CSS for child envrionments Do not attach runner to a non-exsiting network in QA Remove not needed default statement Improve docs about allowing some side effects on the constructor Move all ENV to Runtime::Env Rename .scss files to use snake_case Moves missing branch into a vue file ...
\| * \| \| \| \| \| \|	Put back class names used in shared test	Filipa Lacerda	2018-02-12	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Makes close/reopen issue request to inside the vue app	Filipa Lacerda	2018-02-09	8	-40/+114
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'winh-new-branch-dropdown-style' into 'master'	Phil Hughes	2018-02-13	3	-7/+9
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup new branch/merge request form in issues Closes #41938 See merge request gitlab-org/gitlab-ce!16854
\| * \| \| \| \| \| \|	Cleanup new branch/merge request form in issueswinh-new-branch-dropdown-style	Winnie Hellmann	2018-02-12	3	-7/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'jivl-update-katex' into 'master'	Clement Ho	2018-02-12	1	-35/+9
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated katex library Closes #43032 See merge request gitlab-org/gitlab-ce!15864
\| * \| \| \| \| \| \|	Addressed mr observationsjivl-update-katex	Jose Ivan Vargas	2018-02-12	1	-8/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into jivl-update-katex	Jose Ivan Vargas	2018-02-12	79	-534/+1713
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into jivl-update-katex	Jose Ivan Vargas	2018-02-05	505	-8921/+12730
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	removed unused imports	Jose Ivan Vargas	2017-12-21	1	-2/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Removed the remains of katex from vendor assets and load everything via webpack	Jose Ivan Vargas	2017-12-21	1	-8/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	added katex.js and load it via webpack	Jose Ivan Vargas	2017-12-21	1	-14/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Clean new Flash() and stop disabling no-new (eslint) when possible	André Luís	2018-02-12	3	-7/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'jivl-fix-missing-js-selector-realtime-pipeline' into 'master'	Filipa Lacerda	2018-02-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed missing js selector for the realtime pipelines commit component See merge request gitlab-org/gitlab-ce!17061
\| * \| \| \| \| \| \| \| \| \|	Fixed missing js selector for the realtime pipelines commit compjivl-fix-missing-js-selector-realtime-pipeline	Jose Ivan Vargas	2018-02-12	1	-1/+1
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'groups-select-axios' into 'master'	Filipa Lacerda	2018-02-12	1	-11/+11
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert groups_select ajax to use axios See merge request gitlab-org/gitlab-ce!17041
\| * \| \| \| \| \| \| \| \|	Convert groups_select ajax to use axiosgroups-select-axios	Phil Hughes	2018-02-09	1	-11/+11
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'diff-and-gpg-badges-ajax-refactor' into 'master'	Phil Hughes	2018-02-12	2	-7/+17
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaced use of $.get with axios.get and updated tests See merge request gitlab-org/gitlab-ce!16989
\| * \| \| \| \| \| \| \| \| \|	Fixed bug with param configdiff-and-gpg-badges-ajax-refactor	Constance Okoghenun	2018-02-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	changed params passed to from a string to an object	Constance Okoghenun	2018-02-12	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixed typo, updated test, and removed commented code	Constance Okoghenun	2018-02-08	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Replaced use of $.get with axios.get and updated tests	Constance Okoghenun	2018-02-08	2	-7/+17
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'refactor/move-issuable-time-tracker-vue-component' into 'master'	Filipa Lacerda	2018-02-12	2	-74/+79
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move IssuableTimeTracker vue component See merge request gitlab-org/gitlab-ce!16948
\| * \| \| \| \| \| \| \| \| \| \|	Move IssuableTimeTracker vue component	George Tsiolis	2018-02-12	2	-74/+79
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '42928-default-protected-variables-to-off' into 'master'	Filipa Lacerda	2018-02-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default CI variables to unprotected Closes #42928 See merge request gitlab-org/gitlab-ce!17039
\| * \| \| \| \| \| \| \| \| \| \|	Default CI variables to unprotected42928-default-protected-variables-to-off	Eric Eastwood	2018-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/42928
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'npm-waitforimages' into 'master'	Tim Zallmann	2018-02-12	4	-5/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update jquery.waitforimages & use npm version See merge request gitlab-org/gitlab-ce!17004
\| * \| \| \| \| \| \| \| \| \| \|	Update jquery.waitforimages & use npm versionnpm-waitforimages	Phil Hughes	2018-02-08	4	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#39072
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '42922-environment-name' into 'master'	Phil Hughes	2018-02-12	1	-11/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add tooltip in enviroments names" Closes #42922 See merge request gitlab-org/gitlab-ce!17029
\| * \| \| \| \| \| \| \| \| \| \|	Adds tooltip for environment name42922-environment-name	Filipa Lacerda	2018-02-09	1	-11/+20
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds CSS for child envrionments
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-remove-confirmation_input' into 'master'	Clement Ho	2018-02-09	1	-62/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove confirmation_input component See merge request gitlab-org/gitlab-ce!17046
\| * \| \| \| \| \| \| \| \| \| \|	Remove confirmation_input	Winnie Hellmann	2018-02-09	1	-62/+0
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-mermaid-xss' into 'security-10-4'	Douwe Maan	2018-02-09	1	-0/+3
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.4] Fix stored XSS in code blocks
* \| \| \| \| \| \| \| \| \|	Merge branch 'fl-mr-widget-missing-branch' into 'master'	Phil Hughes	2018-02-09	3	-44/+63
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves missing branch into a vue file See merge request gitlab-org/gitlab-ce!17016
\| * \| \| \| \| \| \| \| \|	Remove not needed default statement	Filipa Lacerda	2018-02-09	1	-1/+0
\| \| \| \| \| \| \| \| \| \|