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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Reinstall shell on the test env if it's outdatedshell-test-rebuild	Alejandro Rodríguez	2017-06-19	2	-12/+17
\|
*	Merge branch 'docs/object-storage' into 'master'	Achilleas Pipinellis	2017-06-19	1	-1/+13
\|\ \| \| \| \| \| \| \| \|	Add info about artifacts object storage in docs See merge request !12208
\| *	Add info about artifacts object storage in docsdocs/object-storage	Achilleas Pipinellis	2017-06-16	1	-1/+13
\| \|
* \|	Merge branch 'dm-parallel-diff-unchanged-line-comment' into 'master'	Sean McGivern	2017-06-19	5	-24/+33
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't display comment on unchanged line on both sides in parallel diff Closes #33864 See merge request !12275
\| * \|	Don't display comment on unchanged line on both sides in parallel diff	Douwe Maan	2017-06-19	5	-24/+33
\| \| \|
* \| \|	Merge branch '25164-disable-fork-on-project-limit' into 'master'	Rémy Coutable	2017-06-19	11	-0/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable fork button on project limit Closes #25164 See merge request !12145
\| * \| \|	Disable fork button on project limit	vanadium23	2017-06-16	11	-0/+35
\| \| \| \|
* \| \| \|	Merge branch 'moved-submodules' into 'master'	Rémy Coutable	2017-06-19	5	-41/+128
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	repository: index submodules by path See merge request !10798
\| * \| \| \|	repository: index submodules by path	David Turner	2017-06-16	5	-41/+128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Submodules have a name in the configuration, but this name is simply the path at which the submodule was initially checked in (by default -- the name is totally arbitrary). If a submodule is moved, it retains its original name, but its path changes. Since we discover submodules inside trees, we have their path but not necessarily their name. Make the submodules() function return the submodule hash indexed by path rather than name, so that renamed submodules can be looked up. Signed-off-by: David Turner <novalis@novalis.org>
* \| \| \| \|	Merge branch 'update-column-in-batches-batch-size' into 'master'	Rémy Coutable	2017-06-19	1	-0/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Put an upper limit on update batches See merge request !12265
\| * \| \| \| \|	Put an upper limit on update batchesupdate-column-in-batches-batch-size	Yorick Peterse	2017-06-19	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When using update_column_in_batches the upper limit on the batch size is now 1000. This ensures that for very large tables we don't lock tens of thousands of rows during the update. This in turn should reduce the likelyhood of running into deadlocks.
* \| \| \| \| \|	Merge branch 'reduce-sidekiq-wait-timings' into 'master'	Rémy Coutable	2017-06-19	3	-2/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce wait timings for Sidekiq jobs See merge request !12270
\| * \| \| \| \| \|	Reduce wait timings for Sidekiq jobsreduce-sidekiq-wait-timings	Yorick Peterse	2017-06-19	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reduces the time spent waiting for Sidekiq jobs to complete in JobWaiter, and reduces the sleep interval when trying to acquire the lease for refreshing authorizations. These changes should reduce the time spent just waiting for a lock, which we seem to be spending most time in when running the AuthorizedProjectsWorker.
* \| \| \| \| \| \|	Merge branch '30725-reset-user-limits-when-unchecking-external-user' into ↵	Douwe Maan	2017-06-19	3	-13/+54
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Ensures default user limits when external user is unchecked Closes #30725 See merge request !12218
\| * \| \| \| \| \| \|	refactors user model validations30725-reset-user-limits-when-unchecking-external-user	Tiago Botelho	2017-06-19	2	-9/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Ensures default user limits when external user is unchecked	Tiago Botelho	2017-06-16	3	-6/+45
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '28139-use-color-input-broadcast-messages' into 'master'	Phil Hughes	2017-06-19	2	-2/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use color inputs for broadcast messages Closes #28139 See merge request !12237
\| * \| \| \| \| \| \| \|	Use color inputs for broadcast messages	Annabel Dunstone Gray	2017-06-19	2	-2/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'group-label-permissions-docs' into 'master'	Achilleas Pipinellis	2017-06-19	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs permissions for group labels See merge request !12269
\| * \| \| \| \| \| \| \|	Docs permissions for group labelsgroup-label-permissions-docs	Victor Wu	2017-06-19	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-label-filter-hover' into 'master'	Annabel Dunstone Gray	2017-06-19	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Darken label color in search filter when hovering Closes #31899 See merge request !12182
\| * \| \| \| \| \| \| \|	Darken label color in search filter when hoveringwinh-label-filter-hover	winh	2017-06-16	2	-1/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '33819-authorby' into 'master'	Douwe Maan	2017-06-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	correct ByAuthor translation in commit box Closes #33819 See merge request !12256
\| * \| \| \| \| \| \| \|	correct ByAuthor translation in commit box33819-authorby	Simon Knox	2017-06-19	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mk-add-project-moved-errors-for-git' into 'master'	Douwe Maan	2017-06-19	12	-68/+265
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "project was moved" error messages for git See merge request !11259
\| * \| \| \| \| \| \| \| \|	Add specific test case	Michael Kozono	2017-06-16	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This test and its context exist only to ensure this behavior is fixed: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11259#note_29262426
\| * \| \| \| \| \| \| \| \|	Add “Project moved” error to Git-over-HTTP	Michael Kozono	2017-06-16	3	-40/+37
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add “Project moved” error to Git-over-SSH	Michael Kozono	2017-06-16	9	-28/+208
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '27697-make-arrow-icons-consistent-in-dropdown' into 'master'adam-is-testing-mr-templates	Annabel Dunstone Gray	2017-06-19	8	-26/+57
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[#27697] Make the arrow icons consistent in dropdown Closes #27697 See merge request !9659
\| * \| \| \| \| \| \| \| \|	[#27697] Make the arrow icons consistent in dropdown	TM Lee	2017-06-19	8	-26/+57
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'add-since-and-until-params-to-issuables' into 'master'	Rémy Coutable	2017-06-19	8	-3/+87
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add created_after and created_before params to issuables Closes #32901 See merge request !12151
\| * \| \| \| \| \| \| \| \|	add since and until params to issuables	Kyle Bishop	2017-06-18	8	-3/+87
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '33461-display-user-id' into 'master'	Grzegorz Bizon	2017-06-19	3	-4/+34
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display own user id in account settings pages Closes #33461 See merge request !12141
\| * \| \| \| \| \| \| \| \| \|	Update test to use single quotes and Four-Phase test conventions	Riccardo Padovani	2017-06-15	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	#33641: add spec for profile page	Riccardo Padovani	2017-06-15	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	33641: Add changelog	Riccardo Padovani	2017-06-13	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	#33461: Display own user id in account settings page	Riccardo Padovani	2017-06-13	1	-4/+11
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '33824-update-mr-prometheus-docs' into 'master'	Achilleas Pipinellis	2017-06-19	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Prometheus Merge Request Metrics page See merge request !12259
\| * \| \| \| \| \| \| \| \|	Update Prometheus Merge Request Metrics page	Joshua Lambert	2017-06-19	2	-4/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '26212-upload-user-avatar-trough-api' into 'master'	Rémy Coutable	2017-06-19	4	-0/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Accept image for avatar in user API Closes #26212 See merge request !12143
\| * \| \| \| \| \| \| \| \|	Accept image for avatar in user API	vanadium23	2017-06-16	4	-0/+17
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue_33205' into 'master'	Sean McGivern	2017-06-19	3	-4/+28
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix API bug accepting wrong merge requests parameters Closes #33205 See merge request !12173
\| * \| \| \| \| \| \| \| \|	Fix API bug accepting wrong merge requests parametersissue_33205	Felipe Artur	2017-06-16	3	-4/+28
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'consistent-filtered-search-boards' into 'master'	Phil Hughes	2017-06-19	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make filtered search boards more consistent with EE Closes #33723 See merge request !12235
\| * \| \| \| \| \| \| \| \| \|	Make filtered search boards more consistent with EEconsistent-filtered-search-boards	Clement Ho	2017-06-16	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'consistent-dropdown-hint' into 'master'	Phil Hughes	2017-06-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make dropdown hint consistent with EE version Closes #33721 See merge request !12234
\| * \| \| \| \| \| \| \| \| \|	Make dropdown hint consistent with EE versionconsistent-dropdown-hint	Clement Ho	2017-06-16	1	-1/+1
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-atom-eslint' into 'master'	Tim Zallmann	2017-06-18	1	-16/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix eslint import resolver in Atom v1.18.0 See merge request !12238
\| * \| \| \| \| \| \| \| \| \|	refactor zopfli fallback configfix-atom-eslint	Mike Greiling	2017-06-16	1	-15/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	don't make assumptions about command line arguments invoking webpack config	Mike Greiling	2017-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|