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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'ide-wordwrap' into 'master'	Tim Zallmann	2018-03-28	1	-24/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Enable word wrap in IDE Closes #44303 See merge request gitlab-org/gitlab-ce!17994
\| *	Enable word wrap in IDE	Phil Hughes	2018-03-27	1	-24/+16
\| \| \| \| \| \| \| \|	Closes #44303
* \|	Merge branch 'update-unresolved-discussions-vue-component' into 'master'	Clement Ho	2018-03-27	4	-13/+29
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add i18n and update specs for ShaMismatch vue component See merge request gitlab-org/gitlab-ce!17870
\| * \|	Add i18n and update specs for ShaMismatch vue component	George Tsiolis	2018-03-27	4	-13/+29
\| \| \|
* \| \|	[FIX] Fixed bug in dropdown selector when selecting the same selection again	bitsapien	2018-03-27	2	-1/+27
\| \|/ \|/\|
* \|	Merge branch 'ide-diff-cursor' into 'master'	Tim Zallmann	2018-03-26	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable cursor for review mode in the IDE Closes #44307 See merge request gitlab-org/gitlab-ce!17955
\| * \|	Disable cursor for review mode in the IDEide-diff-cursor	Phil Hughes	2018-03-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also disables occurrences highlights & the line highlight for the review mode. Closes #44307
* \| \|	Merge branch ↵	Kamil Trzciński	2018-03-26	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name' into 'master' Resolve "Controller parameters handling sensitive information should use a more specific name" Closes #43316 See merge request gitlab-org/gitlab-ce!17796
\| * \| \|	Make Variable key not secret43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name	Matija Čupić	2018-03-22	1	-1/+1
\| \| \| \|
\| * \| \|	Check for secret_key and secret_value in CI Variable native list js spec	Matija Čupić	2018-03-17	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'winh-cleanup-comment-submit-test' into 'master'	Clement Ho	2018-03-23	1	-92/+225
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup test for disabling comment submit button See merge request gitlab-org/gitlab-ce!17930
\| * \| \| \|	Cleanup test for disabling comment submit buttonwinh-cleanup-comment-submit-test	Winnie Hellmann	2018-03-22	1	-92/+225
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Filipa Lacerda	2018-03-23	1	-31/+58
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44218-add-internationalization-support-for-the-prometheus-merge-request-widget' into 'master' Resolve "Add internationalization support for the Prometheus Merge Request widget" Closes #44218 See merge request gitlab-org/gitlab-ce!17753
\| * \| \| \|	Add i18n support for the mrWidget prometheus memory widget44218-add-internationalization-support-for-the-prometheus-merge-request-widget	Jose Ivan Vargas	2018-03-23	1	-31/+58
\| \|/ / /
* \| \| \|	Rename modal.vue to deprecated_modal.vuewinh-deprecate-old-modal	Winnie Hellmann	2018-03-22	1	-3/+3
\|/ / /
* \| \|	Merge branch 'performance-bar-position-fix' into 'master'	Filipa Lacerda	2018-03-22	1	-10/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \|
* \| \| \|	Merge branch 'disable-btn-mr-when-posting-comment' into 'master'	Fatih Acet	2018-03-21	1	-0/+14
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disables the button when submitting comment. Closes #39661 See merge request gitlab-org/gitlab-ce!17918
\| * \| \|	Adds tests	Jacob Schatz	2018-03-21	1	-0/+14
\| \| \| \|
* \| \| \|	Changes empty project avatar to identicon in the IDE	Phil Hughes	2018-03-21	1	-0/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44298
* \| \| \|	Merge branch 'make-ide-ce' into 'master'	Tim Zallmann	2018-03-21	43	-0/+4545
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move IDE to CE Closes #44157 See merge request gitlab-org/gitlab-ce!17887
\| * \| \|	updated file references in specs	Phil Hughes	2018-03-20	43	-428/+629
\| \| \| \|
\| * \| \|	Move IDE to CE	Phil Hughes	2018-03-20	43	-0/+4344
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also makes the IDE generally available
* \| \| \|	Merge branch 'update-spec-import-path-for-vue-mount-component-helper' into ↵	Clement Ho	2018-03-20	15	-22/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update spec import path for vue mount component helper See merge request gitlab-org/gitlab-ce!17880
\| * \| \| \|	Update spec import path for vue mount component helper	George Tsiolis	2018-03-20	15	-22/+22
\| \|/ / /
* \| \| \|	Resolve "Loss of input text on comments after preview"	Simon Knox	2018-03-20	1	-5/+5
\|/ / /
* \| \|	Merge branch '42558-add-monitoring-no-data-empty-state' into 'master'	Phil Hughes	2018-03-20	2	-34/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Prometheus graphs have no empty state when no data is present" Closes #42558 See merge request gitlab-org/gitlab-ce!17759
\| * \| \|	fix tests for dahboard.vue42558-add-monitoring-no-data-empty-state	Mike Greiling	2018-03-19	2	-34/+13
\| \| \|/ \| \|/\|
* \| \|	move render_gfm into behaviors directory	Mike Greiling	2018-03-19	6	-8/+6
\| \| \|
* \| \|	Show Ajax requests in performance bar	Sean McGivern	2018-03-19	4	-0/+270
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	But first, rewrite the performance bar in Vue: 1. Remove the peek-host gem and replace it with existing code. This also allows us to include the host in the JSON response, rather than in the page HTML. 2. Leave the line profiler parts as here-be-dragons: nicer would be a separate endpoint for these, so we could use them on Ajax requests too. 3. The performance bar is too fiddly to rewrite right now, so apply the same logic to that. Then, add features! All requests made through Axios are able to be tracked. To keep a lid on memory usage, only the first two requests for a given URL are tracked, though. Each request that's tracked has the same data as the initial page load, with the exception of the performance bar and the line profiler, as explained above.
* \|	Move ShaMismatch vue component	George Tsiolis	2018-03-19	1	-4/+5
\| \|
* \|	Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' ↵	Mike Greiling	2018-03-19	1	-4/+4
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	into 'master' Move UnresolvedDiscussions vue component See merge request gitlab-org/gitlab-ce!17538
\| *	Move UnresolvedDiscussions vue component	George Tsiolis	2018-03-08	1	-4/+4
\| \|
* \|	Merge branch 'mr-widget-deployment-styling' into 'master'	Filipa Lacerda	2018-03-14	3	-221/+205
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix styling of multiple environments in merge request widget Closes #40610 See merge request gitlab-org/gitlab-ce!17663
\| * \|	removed useless v-if	Phil Hughes	2018-03-14	2	-43/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed pointless test & changed some deployment tests to make more sense added in v-tooltip
\| * \|	fixed eslint	Phil Hughes	2018-03-13	1	-1/+1
\| \| \|
\| * \|	updated specs	Phil Hughes	2018-03-13	3	-184/+197
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'master' into 44149-issue-comment-buttons	Filipa Lacerda	2018-03-13	6	-19/+123
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (29 commits) Fix provider server URL used when listing repos to import Fix inconsistent punctuation on MR form Update dependency for svgs Fix timestamp to include %M instead of %I for post-deploy migrations. Use Gitaly 0.89.0 Resolve "Hover style for sidebar dropdowns is wrong" fixed spec Respect the protocol in `expose_url` Fix removes source branch text being rendered in merged state Fix code and wiki search results when filename is non-ASCII Include the ee/ directory in backtraces Use GitLab fork of zaproxy Updates file extensions on Vue docs fixed note polling not sending updated last fetched at date added spec for polling Add changelog entry Use `list.id` for `:key` added mutation spec Bump parser and unparser gems to remove warnings fix polling not working correctly Fixed issue notes being duplicated ...
\| * \|	Merge branch 'refactor/move-mr-widget-nothing-to-merge-vue-component' into ↵	Clement Ho	2018-03-12	1	-3/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Move NothingToMerge vue component See merge request gitlab-org/gitlab-ce!17544
\| \| * \|	Move NothingToMerge vue component	George Tsiolis	2018-03-08	1	-3/+3
\| \| \|/
\| * \|	Merge branch 'removes-source-branch-widget-state' into 'master'	Filipa Lacerda	2018-03-12	1	-0/+34
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix removes source branch text being rendered in merged state Closes #44163 See merge request gitlab-org/gitlab-ce!17687
\| \| * \|	fixed spec	Phil Hughes	2018-03-12	1	-0/+1
\| \| \| \|
\| \| * \|	Fix removes source branch text being rendered in merged stateremoves-source-branch-widget-state	Phil Hughes	2018-03-12	1	-0/+33
\| \| \| \|
\| * \| \|	Merge branch 'fix-duplicate-notes' into 'master'	Filipa Lacerda	2018-03-12	3	-3/+79
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue notes being duplicated Closes #44099 See merge request gitlab-org/gitlab-ce!17671
\| \| * \| \|	fixed note polling not sending updated last fetched at datefix-duplicate-notes	Phil Hughes	2018-03-12	2	-1/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added spec for polling
\| \| * \| \|	added mutation spec	Phil Hughes	2018-03-10	1	-2/+13
\| \| \| \| \|
\| * \| \| \|	Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'	Phil Hughes	2018-03-12	1	-13/+7
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "Remove source branch" button in MR widget during MWPS state Closes #42814 and #4281 See merge request gitlab-org/gitlab-ce!17192
\| \| * \| \|	Fix "Remove source branch" button in MR widget during MWPS state42814-fix-remove-source-branch-when-mwps	Eric Eastwood	2018-03-08	1	-13/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/4281
* \| \| \| \|	Fix loading icon being visible in the wrong button44149-issue-comment-buttons	Filipa Lacerda	2018-03-12	3	-0/+96
\|/ / / /
* \| \| \|	Merge branch 'remove-jquery-globals' into 'master'	Phil Hughes	2018-03-12	64	-6/+75
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Require jQuery to be explicitly imported See merge request gitlab-org/gitlab-ce!17674