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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Adds in changeloggitlab_elt	Jacob Schatz	2018-04-25	1	-0/+5
\|
*	Got SQL working.	Jacob Schatz	2018-04-25	1	-6/+3
\|
*	add rake take for pseudonymity_dump.	Jacob Schatz	2018-04-24	1	-0/+10
\|
*	Merge branch '45725-broken-master' into 'master'	Clement Ho	2018-04-24	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Broken master with `static_analysis` and `karma` being broken" Closes #45725 See merge request gitlab-org/gitlab-ce!18569
\| *	Update import on actions file to fix conflict when rewire plugin was added	Filipa Lacerda	2018-04-24	1	-2/+2
\|/
*	Merge branch 'patch-29' into 'master'	Rémy Coutable	2018-04-24	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Broken link fix See merge request gitlab-org/gitlab-ce!18564
\| *	Broken link fix	Ana Karabanova 🐱	2018-04-24	1	-1/+1
\| \|
* \|	Merge branch 'matbaj/gitlab-ce-add-inherit-command' into 'master'	Rémy Coutable	2018-04-24	4	-3/+105
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add copy_metadata quick action Closes #38450 See merge request gitlab-org/gitlab-ce!18497
\| * \	Merge branch 'master' into matbaj/gitlab-ce-add-inherit-command	Sean McGivern	2018-04-24	465	-2480/+2764
\| \|\ \
\| * \| \|	Make /copy_metadata only handle the first issuable passed	Sean McGivern	2018-04-24	3	-13/+24
\| \| \| \|
\| * \| \|	Merge branch 'master' into matbaj/gitlab-ce-add-inherit-command	Sean McGivern	2018-04-19	3483	-48546/+139782
\| \|\ \ \
\| * \ \ \	Rebase branch 'add-inherit-command'	Mateusz Bajorski	2018-03-03	0	-0/+0
\| \|\ \ \ \
\| \| * \| \| \|	Fixed inconsistent descriptions and refactored reference checking	Mateusz Bajorski	2018-02-01	2	-3/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Fixed typos and improved reference checking	Mateusz Bajorski	2018-01-31	4	-23/+23
\| \| \| \| \| \|
\| \| * \| \| \|	Changed command name to copy_metadata and added MR support	Mateusz Bajorski	2018-01-21	4	-32/+34
\| \| \| \| \| \|
\| \| * \| \| \|	Add Inherit quick action	Mateusz Bajorski	2018-01-15	4	-1/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #38450
\| * \| \| \| \|	Fixed inconsistent descriptions and refactored reference checking	Mateusz Bajorski	2018-03-03	2	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed typos and improved reference checking	Mateusz Bajorski	2018-03-03	4	-23/+23
\| \| \| \| \| \|
\| * \| \| \| \|	Changed command name to copy_metadata and added MR support	Mateusz Bajorski	2018-03-03	4	-32/+34
\| \| \| \| \| \|
\| * \| \| \| \|	Add Inherit quick action	Mateusz Bajorski	2018-03-03	4	-1/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #38450
* \| \| \| \| \|	Merge branch 'bvl-fix-maintainer-push-error' into 'master'	Douwe Maan	2018-04-24	16	-72/+176
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors on pushing/editing files on empty repositories Closes #44618 and #42583 See merge request gitlab-org/gitlab-ce!18462
\| * \| \| \| \| \|	Allow admins to push to empty repos	Bob Van Landuyt	2018-04-24	12	-61/+102
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Only show push-to-master authorized users	Bob Van Landuyt	2018-04-24	4	-11/+74
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide the push to master instructions for users that are not allowed to do that. Also hide buttons that would direct them to commit directly in master
* \| \| \| \| \|	Merge branch 'jr-40616-external-lfs-docs' into 'master'	Douwe Maan	2018-04-24	1	-0/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for externally hosted LFS objects See merge request gitlab-org/gitlab-ce!18508
\| * \| \| \| \| \|	Document externally hosted LFS objects	James Ramsay	2018-04-24	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API can be used by project owners to disable LFS object verification that will block pushes that contain LFS pointers but no the objects.
* \| \| \| \| \| \|	Merge branch '30998-add-babel-rewire-plugin' into 'master'	Clement Ho	2018-04-24	52	-142/+197
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add some way to mock and spy on default ES modules" Closes #30998 See merge request gitlab-org/gitlab-ce!18116
\| * \| \| \| \| \|	fix CI BABEL_ENV variable	Mike Greiling	2018-04-23	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	document the spyOnDependency method	Mike Greiling	2018-04-23	1	-5/+43
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	disable sourcemaps when generating coverage report to avoid out-of-memory errors	Mike Greiling	2018-04-23	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	only apply rewire plugin when running karma tests	Mike Greiling	2018-04-23	2	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix illegal references to "this" in module context	Mike Greiling	2018-04-23	15	-19/+19
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add default exports to prevent rewire plugin from breaking vuex	Mike Greiling	2018-04-23	8	-0/+24
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	convert remaining instances of import * to use spyOnDependency	Mike Greiling	2018-04-23	8	-48/+35
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix more instances of "import *" with spyOnDependency	Mike Greiling	2018-04-23	11	-45/+32
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix tests in filtered_search_manager_spec.js	Mike Greiling	2018-04-23	1	-8/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix tests in droplab/hook_spec.js	Mike Greiling	2018-04-23	1	-3/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix tests in comment_type_toggle_spec.js	Mike Greiling	2018-04-23	1	-3/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add spyOnDependency method	Mike Greiling	2018-04-23	4	-7/+18
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	update babel config	Mike Greiling	2018-04-23	1	-0/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add babel-plugin-rewire to karma build	Mike Greiling	2018-04-23	3	-1/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '4950-unassign-slash-command-preview-fix' into 'master'	Sean McGivern	2018-04-24	2	-2/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix unassign slash command preview See merge request gitlab-org/gitlab-ce!18447
\| * \| \| \| \| \| \|	Fix unassign slash command preview	Athar Hameed	2018-04-24	2	-2/+9
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch ↵	Grzegorz Bizon	2018-04-24	3	-19/+40
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43111-controller-projects-mergerequestscontroller-index-executes-more-than-100-sql-queries' into 'master' Resolve "Controller Projects::MergeRequestsController#index executes more than 100 SQL queries" Closes #43111 See merge request gitlab-org/gitlab-ce!18561
\| * \| \| \| \| \| \|	Fix an N+1 for MRs from forks on the MR index page	Sean McGivern	2018-04-24	3	-19/+40
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'show-runners-description-on-jobs-page' into 'master'	Kamil Trzciński	2018-04-24	3	-2/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show Runner's description on job's page See merge request gitlab-org/gitlab-ce!17321
\| * \| \| \| \| \| \| \|	Add CHANGELOG entry	Tomasz Maczukin	2018-04-24	1	-0/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Show Runner's description on job's page	Tomasz Maczukin	2018-04-24	2	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '10244-add-project-ci-cd-settings' into 'master'	Kamil Trzciński	2018-04-24	12	-1/+178
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce new ProjectCiCdSettings model with group_runners_enabled See merge request gitlab-org/gitlab-ce!18144
\| * \| \| \| \| \| \|	Merge branch 'master' into 10244-add-project-ci-cd-settings	Dylan Griffith	2018-04-24	834	-5239/+12263
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Introduce new ProjectCiCdSetting10244-add-project-ci-cd-settings	Yorick Peterse	2018-04-16	12	-2/+179
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This model and the corresponding table will be used for storing settings specific to CI/CD, starting with the "group_runners_enabled" boolean. The model is called ProjectCiCdSetting and not ProjectCiCdSettings. The project exporter doesn't like plural model names as it uses "classify" which turns those into singular (so "ProjectCiCdSettings" becomes "ProjectCiCdSetting", producing an error if said class is undefined). The initial work in this commit was done by Dylan Griffith, with most of the migration work being done by Yorick Peterse.