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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix MR discussion not loaded issue51958-fix-mr-discussion-loading	Mark Chao	2018-10-01	2	-4/+5
\| \| \| \| \| \|	Display `formatter` as the sole content of `position` object. This means `diff_file` data is not referenced, which is the caseu of "IOError: not opened for reading".
*	Fixed file templates not being fully fetched in Web IDE	Phil Hughes	2018-09-28	2	-4/+13
\| \| \| \|	Closes #51912
*	Merge branch 'group-weight-icon-and-text' into 'master'	Annabel Dunstone Gray	2018-09-27	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Add right margin to board-card-number See merge request gitlab-org/gitlab-ce!21939
\| *	Add right margin to board-card-number	George Tsiolis	2018-09-26	1	-1/+1
\| \|
* \|	Merge branch '50904-use-vuex-store-job' into 'master'	Phil Hughes	2018-09-27	5	-109/+26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Uses new Vuex store in job log page See merge request gitlab-org/gitlab-ce!21961
\| * \|	Uses new Vuex store in job log page	Filipa Lacerda	2018-09-27	5	-109/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes old mediator and service pattern and uses the new store. Middle step before moving everything into one single vue app
* \| \|	Updates Vue job components to match new API	Filipa Lacerda	2018-09-27	5	-66/+73
\|/ /
* \|	Merge branch 'ide-refactor-for-ee-specific' into 'master'	Phil Hughes	2018-09-27	3	-53/+59
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE Port (Refactor IDE to allow RightPane extension) See merge request gitlab-org/gitlab-ce!21920
\| * \|	Refactor IDE to allow RightPane extensionide-refactor-for-ee-specific	Paul Slaughter	2018-09-26	3	-53/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? - This is needed by the Web Terminal EE feature. https://gitlab.com/gitlab-org/gitlab-ee/issues/5426 Notes: - RightPane component tabs is now data driven.
* \| \|	Merge branch '50904-update-scroll-utils' into 'master'	Phil Hughes	2018-09-27	3	-10/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extracts scroll position checks into reusable functions See merge request gitlab-org/gitlab-ce!21931
\| * \| \|	Extracts scroll position checks into reusable functions50904-update-scroll-utils	Filipa Lacerda	2018-09-26	3	-10/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With the new Job Log page in Vue, we'll need to reuse the same functions for scrolling that we're using in the jQuery one. This page extracts that logic into reusable functions
* \| \| \|	Fixes performance bar looking for a key in a undefined prop	Filipa Lacerda	2018-09-27	2	-13/+26
\| \| \| \|
* \| \| \|	Merge branch 'jivl-fix-monitoring-dashboard-resizing-navbar' into 'master'	Mike Greiling	2018-09-26	2	-28/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix monitoring dashboard not resizing properly See merge request gitlab-org/gitlab-ce!21730
\| * \| \| \|	Change forceRedraw key formatjivl-fix-monitoring-dashboard-resizing-navbar	Jose Vargas	2018-09-25	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Jose Vargas	2018-09-25	214	-1436/+1619
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jivl-fix-monitoring-dashboard-resizing-navbar
\| * \| \| \| \|	Fix monitoring dashboard not working properly	Jose Vargas	2018-09-25	2	-28/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a bug when the monitoring dashboard wouldn't redraw for when the sidebar was collapsed/expanded on medium to small screens. This is done by enforcing vue to update based on the change of a key
* \| \| \| \| \|	Fix import statement for the skeleton notes	Jose Vargas	2018-09-26	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Bump GitLab UI version and change the file imports to a single point of ↵jivl-bump-gitlab-ui	Jose Vargas	2018-09-26	8	-19/+20
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	entry notation
* \| \| \| \|	Merge branch 'feature/runner-type-filter-for-admin-view' into 'master'	Kamil Trzciński	2018-09-26	2	-0/+12
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature: Runner type filter for admin view See merge request gitlab-org/gitlab-ce!19649
\| * \| \| \|	add type filter to admin runners page	Alexis Reigel	2018-09-24	2	-0/+12
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rename-squash-before-merge-vue-component' into 'master'	Phil Hughes	2018-09-26	4	-17/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename squash before merge vue component See merge request gitlab-org/gitlab-ce!21851
\| * \| \| \| \|	Rename squash before merge vue component	George Tsiolis	2018-09-21	4	-17/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Resolve "Commit details are not displayed when reviewing an MR commit by commit"	Paul Slaughter	2018-09-26	3	-0/+166
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Add link component from gitlab-ui	Jose Ivan Vargas	2018-09-25	2	-8/+17
\| \| \| \| \|
* \| \| \| \|	Add gitlab-ui skeleton loading	Clement Ho	2018-09-25	8	-106/+27
\| \| \| \| \|
* \| \| \| \|	Merge branch 'leipert-fix-mr-widget-header-margins' into 'master'	Annabel Dunstone Gray	2018-09-25	1	-25/+35
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix margins in merge request header Closes #51726 See merge request gitlab-org/gitlab-ce!21878
\| * \| \| \|	Fix merge request header marginsleipert-fix-mr-widget-header-margins	Lukas Eipert	2018-09-25	1	-25/+35
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ide-remove-stage-buttons' into 'master'	Filipa Lacerda	2018-09-25	2	-4/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove stage/unstage buttons from IDE commit list items Closes #51695 See merge request gitlab-org/gitlab-ce!21845
\| * \| \| \| \|	Fixed alignment of changed icon in commit headide-remove-stage-buttons	Phil Hughes	2018-09-25	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove stage/unstage buttons from IDE commit list items	Phil Hughes	2018-09-20	1	-4/+0
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51695
* \| \| \| \|	Cleanup polling of merge request widget in tests	Winnie Hellmann	2018-09-25	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ce-7013-add-epics-close-support' into 'master'	Douglas Barbosa Alexandre	2018-09-25	3	-1/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of Adding state to epics See merge request gitlab-org/gitlab-ce!21771
\| * \| \| \| \|	Bacport FE changes from Closing Epicsce-7013-add-epics-close-support	Jarka Košanová	2018-09-24	3	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of js and vue files from closing epics
* \| \| \| \| \|	Merge branch 'ide-refactor-for-ee-specific' into 'master'	Phil Hughes	2018-09-25	2	-9/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor IDE index to support EE specific code See merge request gitlab-org/gitlab-ce!21895
\| * \| \| \| \| \|	Refactor IDE index to support EE specific code	Paul Slaughter	2018-09-24	2	-9/+31
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? - The web terminal feature is EE specific and will need to inject some specific options / functions into certain components.
* \| \| \| \| \|	Use Vue component for job artifacts, Commit and Trigger Variables	Filipa Lacerda	2018-09-25	6	-188/+187
\|/ / / / /
* \| \| \| \|	Merge branch 'upgrade-eslint' into 'master'	Marin Jankovski	2018-09-24	55	-99/+101
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade eslint to v5.x See merge request gitlab-org/gitlab-ce!21825
\| * \| \| \| \|	Switch to per-line rule exceptionsupgrade-eslint	Mike Greiling	2018-09-21	1	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Resolve eslint-plugin-vue errors	Mike Greiling	2018-09-20	53	-96/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The eslint-plugin-vue upgrade had some breaking changes to vue/attribute-order which needed to be resolved in order to avoid disabling the rule entirely
\| * \| \| \| \|	Upgrade eslint to v5	Mike Greiling	2018-09-20	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We needed to disable a few eslint-config-airbnb-base rules in order to keep the number of line changes under control. These should be re-enabled asap.
* \| \| \| \| \|	Merge branch 'dm-create-note-return-discussion' into 'master'	Filipa Lacerda	2018-09-24	5	-53/+40
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase performance when creating discussion on diff Closes #49002 See merge request gitlab-org/gitlab-ce!21743
\| * \| \| \| \| \|	Changed `true` string to a boolean	Phil Hughes	2018-09-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed toBeTruthy to toBe(true) in spec
\| * \| \| \| \| \|	Fixed karma spec for getNoteFormData	Phil Hughes	2018-09-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed toggling new notes caused by not returning the stores discussion
\| * \| \| \| \| \|	Use returned discussion from API	Phil Hughes	2018-09-21	4	-53/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now use the returned discussion instead of re-fetching all of the discussions and filtering out the ones we don't need. This speeds up the process of creating a diff discussions by saving us another API request before we can render the discussion
\| * \| \| \| \| \|	Return discussion object from NotesController#create when return_discussion ↵	Douwe Maan	2018-09-21	1	-0/+1
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	param is set
* \| \| \| \| \|	Merge branch 'dz-issue-css-classes' into 'master'	Annabel Dunstone Gray	2018-09-21	3	-9/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename some css classes that are shared between issues and mrs See merge request gitlab-org/gitlab-ce!21856
\| * \| \| \| \| \|	Rename some css classes that are shared between issues and mrs	Dmitriy Zaporozhets	2018-09-21	3	-9/+9
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Correct Gitlab Capitalization in code files	Marcel Amirault	2018-09-21	1	-1/+1
\|/ / / / /
* \| \| \| \|	QA: Fix failure in merge_merge_request_from_fork_spec.rb	Mark Lapierre	2018-09-20	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'	Dmitriy Zaporozhets	2018-09-20	2	-5/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Split admin settings into multiple sub pages" Closes #44998 See merge request gitlab-org/gitlab-ce!21467