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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Shows new branch/mr button even when branch exists	Jacopo	2018-04-19	3	-20/+35
\|
*	Merge branch 'ide-diff-marker-cache-fix' into 'master'	Tim Zallmann	2018-04-19	3	-13/+37
\|\ \| \| \| \| \| \| \| \|	Fixed IDE diff markers being cached too long See merge request gitlab-org/gitlab-ce!18311
\| *	Fixed IDE diff markers being cached too long	Phil Hughes	2018-04-11	3	-13/+37
\| \|
* \|	Merge branch 'ide-staged-changes' into 'master'	Tim Zallmann	2018-04-19	26	-271/+837
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added staged files state to IDE Closes #44842, #44844, and gitlab-ee#4541 See merge request gitlab-org/gitlab-ce!17898
\| * \	Merge branch 'master' into ide-staged-changes	Phil Hughes	2018-04-19	39	-237/+402
\| \|\ \
\| * \| \|	updates to variable names to make more sense	Phil Hughes	2018-04-18	6	-36/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed up duplicate is-collapsed classes
\| * \| \|	Merge branch 'master' into ide-staged-changes	Phil Hughes	2018-04-18	88	-385/+764
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into ide-staged-changes	Phil Hughes	2018-04-17	176	-1440/+1755
\| \|\ \ \ \
\| * \| \| \| \|	correctly dispose cached models	Phil Hughes	2018-04-11	1	-1/+10
\| \| \| \| \| \|
\| * \| \| \| \|	updated icons	Phil Hughes	2018-04-09	10	-15/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed bug where unstaged file when discarded would not take staged file changes
\| * \| \| \| \|	Merge branch 'master' into ide-staged-changes	Phil Hughes	2018-04-09	72	-119/+1454
\| \|\ \ \ \ \
\| * \| \| \| \| \|	fixed failing tests because of passed `null`	Phil Hughes	2018-04-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added spec to check for `head` file
\| * \| \| \| \| \|	Merge branch 'master' into ide-staged-changes	Phil Hughes	2018-04-07	170	-1196/+2636
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	added ability to have `head` file to compare against	Phil Hughes	2018-04-06	6	-11/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed files getting into an opened & active state when it shouldnt
\| * \| \| \| \| \| \|	fixed eslint	Phil Hughes	2018-04-06	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	updates to template text to be i18n ready	Phil Hughes	2018-04-06	5	-27/+35
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixed delayed update viewer	Phil Hughes	2018-04-05	4	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed `key` not being set to correct value
\| * \| \| \| \| \| \|	fixed staged/unstaged files not opening when another 1 is open	Phil Hughes	2018-04-05	3	-9/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes eslint
\| * \| \| \| \| \| \|	fixed tab being clicked throwing an error	Phil Hughes	2018-04-05	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixed changed icon showing after committing	Phil Hughes	2018-04-05	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixed staged content not updating	Phil Hughes	2018-04-05	5	-8/+25
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixed typo in selector	Phil Hughes	2018-04-05	2	-5/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixed karma & eslint	Phil Hughes	2018-04-05	1	-3/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	update staged files to correctly use pending tab	Phil Hughes	2018-04-05	5	-42/+33
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into ide-staged-changes	Phil Hughes	2018-04-05	107	-614/+1039
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into ide-staged-changes	Phil Hughes	2018-04-03	76	-782/+2168
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	fixed alignment with icons	Phil Hughes	2018-03-29	3	-51/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed icon not showing correctly in tab
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into ide-staged-changes	Phil Hughes	2018-03-29	106	-1248/+1683
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into ide-staged-changes	Phil Hughes	2018-03-27	130	-759/+1897
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	double click to stage & unstage fileside-staged-changes	Phil Hughes	2018-03-22	1	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	hide tooltip on collapse button when clicked	Phil Hughes	2018-03-22	3	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	blur the collapse button on click
\| * \| \| \| \| \| \| \| \| \| \|	added tooltips to various icons in the sidebars	Phil Hughes	2018-03-22	12	-102/+246
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed SVG colors
\| * \| \| \| \| \| \| \| \| \| \|	spec fixes	Phil Hughes	2018-03-22	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	correctly stages and unstages files	Phil Hughes	2018-03-22	14	-64/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	after a commit the files are correctly reset correctly enables the ability to have different staged & unstaged changes in the same file
\| * \| \| \| \| \| \| \| \| \| \|	Added staged files state to IDE	Phil Hughes	2018-03-22	18	-195/+486
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/4541
* \| \| \| \| \| \| \| \| \| \| \|	Fix direct_upload when records with null file_store are used	Kamil Trzciński	2018-04-19	3	-16/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Old records have a null value of file_store column. This causes the problems with current direct_upload implementation, as this makes it to choose Store::REMOTE instead of Store::LOCAL. This change moves the store save when change saving the object.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '41059-calculate-artifact-size-more-efficiently' into 'master'	Grzegorz Bizon	2018-04-19	4	-27/+54
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Calculating total size of a project's CI artifacts" Closes #41059 See merge request gitlab-org/gitlab-ce!17839
\| * \| \| \| \| \| \| \| \| \| \| \|	Update ProjectStatistics#build_artifacts_size synchronously without summing ↵	Dylan Griffith	2018-04-19	4	-27/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(#41059) Previously we scheduled a worker to just some this but we were running into performance issues when the build table was getting too large. So now we've updated the code such that this column is updated immediately and incremented/decremented by the correct amount whenever artifacts are created or deleted. We've also added the performance optimization that we do not update this statistic if a project is deleted because it could result in many updates for a project with many builds.
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix label links update on project transfer	Jan Provaznik	2018-04-19	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Get rid of branch element all in bottom bar in WEB IDE"	André Luís	2018-04-19	2	-8/+5
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Resolve "Show `failure_reason` in jobs view content section"	Mayra Cabrera	2018-04-19	9	-163/+295
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '5320-fix-gitlab-features-env-var' into 'master'	Grzegorz Bizon	2018-04-19	3	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get GITLAB_FEATURES from Project#licensed_features instead of Namespace#features (#5320) See merge request gitlab-org/gitlab-ce!18189
\| * \| \| \| \| \| \| \| \| \| \| \|	Get GITLAB_FEATURES from Project#licensed_features instead of ↵5320-fix-gitlab-features-env-var	Dylan Griffith	2018-04-09	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Namespace#features (#5320)
* \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "View labels when editing labels in sidebar and board sidebar"	André Luís	2018-04-18	4	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'revert-goldiloader' into 'master'	Robert Speicher	2018-04-18	16	-42/+42
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert the addition of goldiloader See merge request gitlab-org/gitlab-ce!18458
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Revert the addition of goldiloader	Yorick Peterse	2018-04-18	16	-42/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts the addition of the "goldiloader" Gem and all use of it. While this Gem is very promising it's causing a variety of problems on GitLab.com due to it eager-loading too much data in places where we don't expect/can handle this. At least for the time being this means we have to go back to manually fixing N+1 query problems, but at least those should not cause a negative impact on availability.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-shared-groups-on-group-page' into 'master'	Rémy Coutable	2018-04-18	2	-5/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issues on groups group trees Closes #42407 See merge request gitlab-org/gitlab-ce!18390
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Don't include projects shared as group-descendants"	Bob Van Landuyt	2018-04-18	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 2c3c5b35549185080296670cfe6710aa80f99944. Revisit this after https://gitlab.com/gitlab-org/gitlab-ce/issues/45441
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Recover from errors when a parent is not preloaded	Bob Van Landuyt	2018-04-18	1	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Custom hooks are not triggered by UI wiki edit	Francisco Javier López	2018-04-18	4	-14/+31
\|/ / / / / / / / / / / / / /