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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Include feature spec for realtime pipelinejivl-realtime-update-adding-file	Mayra Cabrera	2018-03-14	1	-9/+18
\|
*	Add realtime pipeline status component for files	Jose Ivan Vargas	2018-03-14	3	-0/+43
\|
*	Merge branch 'gitaly-0.89.0' into 'master'	Robert Speicher	2018-03-12	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Use Gitaly 0.89.0 See merge request gitlab-org/gitlab-ce!17696
\| *	Use Gitaly 0.89.0	Jacob Vosmaer	2018-03-12	1	-1/+1
\| \|
* \|	Merge branch 'sh-bump-ruby-parser' into 'master'	Robert Speicher	2018-03-12	1	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Bump parser and unparser gems to remove warnings See merge request gitlab-org/gitlab-ce!17673
\| * \|	Bump parser and unparser gems to remove warningssh-bump-ruby-parser	Stan Hu	2018-03-09	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These warnings would show when running rspec: ``` warning: parser/current is loading parser/ruby23, which recognizes warning: 2.3.5-compliant syntax, but you are running 2.3.6. warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri. ``` Related PRs: * https://github.com/whitequark/parser/pull/422 * https://github.com/mbj/unparser/pull/79
* \| \|	Merge branch 'allow-ee-in-backtraces' into 'master'	Robert Speicher	2018-03-12	3	-8/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include the ee/ directory in backtraces Closes gitlab-ee#5204 See merge request gitlab-org/gitlab-ce!17664
\| * \| \|	Include the ee/ directory in backtracesallow-ee-in-backtraces	Sean McGivern	2018-03-12	3	-8/+6
\| \| \| \|
* \| \| \|	Merge branch 'refactor/move-mr-widget-nothing-to-merge-vue-component' into ↵	Clement Ho	2018-03-12	5	-48/+56
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Move NothingToMerge vue component See merge request gitlab-org/gitlab-ce!17544
\| * \| \| \|	Move NothingToMerge vue component	George Tsiolis	2018-03-08	5	-48/+56
\| \| \| \| \|
* \| \| \| \|	Merge branch 'removes-source-branch-widget-state' into 'master'	Filipa Lacerda	2018-03-12	4	-1/+41
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-1/+40
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-duplicate-notes' into 'master'	Filipa Lacerda	2018-03-12	7	-17/+94
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-7/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added spec for polling
\| * \| \| \| \|	added mutation spec	Phil Hughes	2018-03-10	2	-8/+21
\| \| \| \| \| \|
\| * \| \| \| \|	fix polling not working correctly	Phil Hughes	2018-03-09	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed issue notes being duplicated	Phil Hughes	2018-03-09	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44099
* \| \| \| \| \|	Merge branch '42579-fix-sidebar-dropdown-hover-style' into 'master'	Phil Hughes	2018-03-12	2	-13/+32
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Hover style for sidebar dropdowns is wrong" Closes #42579 See merge request gitlab-org/gitlab-ce!17519
\| * \| \| \| \| \|	Resolve "Hover style for sidebar dropdowns is wrong"	Lukas Eipert	2018-03-12	2	-13/+32
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'tc-api-fix-expose_url' into 'master'	Stan Hu	2018-03-12	3	-1/+47
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect the protocol in `expose_url` Closes gitlab-ee#5217 See merge request gitlab-org/gitlab-ce!17681
\| * \| \| \| \| \|	Respect the protocol in `expose_url`	Toon Claes	2018-03-12	3	-1/+47
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When https is configured in the URL, also use that, and do not set it to http. Closes gitlab-org/gitlab-ee#5217
* \| \| \| \| \|	Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'	Sean McGivern	2018-03-12	5	-34/+65
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid re-fetching merge-base SHA from Gitaly unnecessarily See merge request gitlab-org/gitlab-ce!17630
\| * \| \| \| \| \|	Remove unused Compare#base_commitosw-stop-recalculating-merge-base-on-mr-loading	Oswaldo Ferreira	2018-03-08	2	-36/+19
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Avoid re-fetching merge-base SHA from Gitaly unnecessarily	Oswaldo Ferreira	2018-03-07	5	-19/+67
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'add-indexes-to-todos-for-heavy-users-like-sean' into 'master'	Yorick Peterse	2018-03-12	3	-1/+36
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add partial indexes on todos to handle users with many todos See merge request gitlab-org/gitlab-ce!17668
\| * \| \| \| \| \| \|	Add partial indexes on todos to handle users with many todosadd-indexes-to-todos-for-heavy-users-like-sean	Greg Stark	2018-03-09	3	-1/+36
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'	Nick Thomas	2018-03-12	3	-4/+21
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix code and wiki search results when filename is non-ASCII See merge request gitlab-org/gitlab-ce!17685
\| * \| \| \| \| \| \| \|	Fix code and wiki search results when filename is non-ASCII	Sean McGivern	2018-03-12	3	-4/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, we only handled non-ASCII file contents, but the name itself can be non-ASCII.
* \| \| \| \| \| \| \| \|	Merge branch 'fl-document-key-vue' into 'master'	Tim Zallmann	2018-03-12	1	-0/+51
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds guidelines regarding `:key` keyword See merge request gitlab-org/gitlab-ce!17400
\| * \| \| \| \| \| \| \| \|	Clean up docsfl-document-key-vue	Filipa Lacerda	2018-03-01	1	-8/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into fl-document-key-vue	Filipa Lacerda	2018-03-01	64	-141/+431
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (53 commits) init sidebar bundle separately to allow EE override Add support for custom container class Update class init config Update FilteredSearchManager init config Add group related config and endpoint methods to be consistent with EE Tag migration specs with :sidekiq to clear queues between tests Add update for packed-refs with git v2.16 Bump GitLab CI test image to use git v2.16 Ignore InlineJavaScript linter in existing script tag locations. Update inline_javascript.rb to lint uses of the javascript filter as well as script tags. Update inline_javascript.rb Forbid all inline script tags in Linter::InlineJavaScript Remove webpack bundle tag for enviroments remove a bunch of superfluous common_vue bundles Remove use of any_instance_of in runner spec Remove trailing line from plugin logger Improve plugins documentation and remove unnecessary rake task Refactor plugins feature and make some doc improvements prefer let and const in webpack config remove common_vue from CommonsChunkPlugin ...
\| * \| \| \| \| \| \| \| \| \|	Adds information about nested v-for	Filipa Lacerda	2018-02-28	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into fl-document-key-vue	Filipa Lacerda	2018-02-28	169	-829/+2617
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (41 commits) Remove cycle analytics bundle webpack entry point Replace whitespace demonstrating line-breaks in GFM docs Remove pipelines mini graph spec that wasn't actually testing anything Change the wording to reduce confusion about whether you need to reconfigure or restart. Add Assignees vue component missing data container Set security harness hook to executable after creation Fix for open-ended parameter's in lograge causing elastic memory issues Docs: explain feature availability in GitLab.com Patch 29 PagesDomain: improve breadcrumbs PagesDomain: Add edit/update functionality Add new job variables: CI_RUNNER_{REVISION,VERSION,EXECUTABLE_ARCH} Re-enable the remaning Wiki Gitaly-Endpoints Labels Select Tests Fix unnecessary spacing between labels Add changelog entry Make label filter URL dynamic Move the remaining EE-specific JS files to ee/ Specify base controller for Doorkeeper Fix example in Vuex docs ...
\| * \| \| \| \| \| \| \| \| \| \|	Fix typos	Filipa Lacerda	2018-02-27	1	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Adds guidelines regarding `:key` keyword	Filipa Lacerda	2018-02-27	1	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-vue-components' into 'master'	Phil Hughes	2018-03-12	1	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates file extensions on Vue docs See merge request gitlab-org/gitlab-ce!17684
\| * \| \| \| \| \| \| \| \| \| \| \|	Updates file extensions on Vue docs	Filipa Lacerda	2018-03-12	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '44139-fix-issue-boards-dup-keys' into 'master'	Phil Hughes	2018-03-12	2	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use object ID to prevent duplicate keys Vue warning on Issue Boards page during development Closes #44139 See merge request gitlab-org/gitlab-ce!17682
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog entry	Kushal Pandya	2018-03-12	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use `list.id` for `:key`	Kushal Pandya	2018-03-12	1	-1/+1
\| \|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '44096-update-zaproxy-image-in-auto-devops-template' into 'master'	Dmitriy Zaporozhets	2018-03-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Update zaproxy image in Auto DevOps template" Closes #44096 See merge request gitlab-org/gitlab-ce!17683
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use GitLab fork of zaproxy	Fabien Catteau	2018-03-12	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #44096
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'	Phil Hughes	2018-03-12	4	-14/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-14/+20
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/4281
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-jquery-globals' into 'master'	Phil Hughes	2018-03-12	289	-20/+386
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Require jQuery to be explicitly imported See merge request gitlab-org/gitlab-ce!17674
\| * \| \| \| \| \| \| \| \| \| \| \|	require jQuery to be explicitly importedremove-jquery-globals	Mike Greiling	2018-03-09	289	-20/+386
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '43702-update-label-dropdown-wording' into 'master'	Phil Hughes	2018-03-12	17	-24/+244
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update wording to specify create/manage project vs group labels in labels dropdown Closes #43702 See merge request gitlab-org/gitlab-ce!17640
\| * \| \| \| \| \| \| \| \| \| \| \|	Add changelog entry43702-update-label-dropdown-wording	Kushal Pandya	2018-03-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Update test for change in label dropdown action name	Kushal Pandya	2018-03-12	5	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|