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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed activity not loading on project homepageproject-homepage-activity	Phil Hughes	2017-08-08	1	-0/+15
\|
*	Show all labels	Regis Boudinot	2017-08-08	2	-5/+5
\|
*	Merge branch '31207-clean-locked-merge-requests' into 'master'	Stan Hu	2017-08-08	1	-0/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
\| *	Store MergeWorker JID on merge request, and clean up stuck merges	Oswaldo Ferreira	2017-08-07	1	-0/+13
\| \|
* \|	33874 confidential issue redesign	Regis Boudinot	2017-08-07	1	-0/+26
\| \|
* \|	Resolve "User dropdown in filtered search does not load avatar on `master`"	Tim Zallmann	2017-08-07	1	-1/+1
\| \|
* \|	Merge branch '32844-issuables-performance' into 'master'	Sean McGivern	2017-08-07	1	-5/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Issuables: Move some code from create services to Sidekiq workers See merge request !13326
\| * \|	Move some after_create parts to worker to improve performance32844-issuables-performance	Jarka Kadlecova	2017-08-07	1	-5/+9
\| \| \|
* \| \|	Group-level new issue & MR using previously selected project	Bryce Johnson	2017-08-07	2	-5/+14
\| \| \|
* \| \|	Merge branch '15664-remove-jquery-nicescroll' into 'master'	Phil Hughes	2017-08-07	1	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove jQuery Nicescroll" Closes #15664, #30860, and #35885 See merge request !13262
\| * \| \|	fix failing specs due phantomJS scroll position	Mike Greiling	2017-08-04	1	-4/+4
\| \| \| \|
* \| \| \|	Merge branch 'zj-project-templates' into 'master'	Sean McGivern	2017-08-07	2	-12/+23
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow projects to be started from a template Closes #32420 See merge request !13108
\| * \| \|	Fix html structure	Filipa Lacerda	2017-08-07	1	-11/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes test for removed behavior
\| * \| \|	Port form back to use form_tag	Z.J. van de Weg	2017-08-07	1	-2/+2
\| \| \| \|
\| * \| \|	Fix last feature test for project templates	Z.J. van de Weg	2017-08-07	1	-2/+2
\| \| \| \|
\| * \| \|	After merge cleanup	Z.J. van de Weg	2017-08-07	1	-5/+1
\| \| \| \|
\| * \| \|	Fixes race condition in project uploads	Tiago Botelho	2017-08-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Originally picked as: 3fc0dbcbebcd470fe14f8b5fb7ad55dc3912402e. But given the internals changed, this was changed now. The changelog was removed too.
\| * \| \|	Merge branch 'master' into zj-project-templates	Filipa Lacerda	2017-08-07	334	-669/+1047
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
\| * \| \| \|	Rename GitLabProjectImporterService and misc fixes	Z.J. van de Weg	2017-08-01	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First round of review, main changes: - templates.title is human readable, #name will be passed around - GitLabProjectImporterService has been renamed
\| * \| \| \|	Allow projects to be started from a template	Z.J. van de Weg	2017-07-28	1	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Started implementation for the first iteration of gitlab-org/gitlab-ce#32420. This will allow users to select a template to start with, instead of an empty repository in the project just created. Internally this is basically a small extension of the ImportExport GitLab projects we already support. We just import a certain import tar archive. This commits includes the first one: Ruby on Rails. In the future more will be added.
* \| \| \| \|	Merge branch 'wiki_title' into 'master'	Robert Speicher	2017-08-07	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add feature rename wiki title Closes #27800 See merge request !10069
\| * \| \| \| \|	Allow wiki pages to be renamed in the UI	wendy0402	2017-08-03	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'bvl-nfs-circuitbreaker' into 'master'	Sean McGivern	2017-08-07	1	-1/+23
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Circuitbreaker for storage paths Closes #32207, #33117, gitlab-com/infrastructure#1946, and gitlab-com/infrastructure#1775 See merge request !11449
\| * \ \ \ \ \	Merge branch 'master' into 'bvl-nfs-circuitbreaker'	Douwe Maan	2017-08-07	8	-62/+147
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/repository.rb # spec/models/repository_spec.rb
\| * \| \| \| \| \| \|	Move hostname to Gitlab::Environment	Bob Van Landuyt	2017-08-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add a Circuitbreaker for storage paths	Bob Van Landuyt	2017-08-04	1	-1/+23
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'add-assign-me-alias' into 'master'	Rémy Coutable	2017-08-07	1	-5/+5
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `/assign me` alias support for assigning issuables to oneself Closes #35304 See merge request !13334
\| * \| \| \| \| \|	Move `let` calls inside the `describe` block using them	Mehdi Lahmam	2017-08-07	1	-5/+5
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	clean up merge request widget UI	Simon Knox	2017-08-07	3	-23/+17
\|/ / / / /
* \| \| \| \|	Merge branch 'fix/sm/34547-cannot-connect-to-ci-server-error-messages' into ↵	Sean McGivern	2017-08-04	1	-27/+70
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix "Cannot connect to CI server error messages" Closes #34547 See merge request !13252
\| * \| \| \| \|	Fix specfix/sm/34547-cannot-connect-to-ci-server-error-messages	Shinya Maeda	2017-08-04	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Fix spec	Shinya Maeda	2017-08-04	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Add a spec for concurrent process	Shinya Maeda	2017-08-04	1	-27/+68
\| \|/ / / /
* \| \| \| \|	Merge branch ↵	Sean McGivern	2017-08-04	1	-0/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at' into 'master' Fix "pipeline_schedules pages throwing error 500" when "Active Ci::PipelineSchedule have a nullified `next_run_at`" Closes #32790 See merge request !13286
\| * \| \| \| \|	Fix specfix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at	Shinya Maeda	2017-08-04	1	-7/+3
\| \| \| \| \| \|
\| * \| \| \| \|	fix	Shinya Maeda	2017-08-04	1	-0/+23
\| \|/ / / /
* \| \| \| \|	Merge branch '34060-simplified-general-project-settings' into 'master'	Mike Greiling	2017-08-04	3	-12/+41
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	34060 Simply general project settings to use expanded panels Closes #34060 See merge request !12620
\| * \| \| \|	fixed up specs	Phil Hughes	2017-07-28	1	-6/+14
\| \| \| \| \|
\| * \| \| \|	trying to fix tests	tauriedavis	2017-07-28	1	-1/+12
\| \| \| \| \|
\| * \| \| \|	try and fix some tests	tauriedavis	2017-07-28	2	-5/+15
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-oauth-checkboxes' into 'master'	Filipa Lacerda	2017-08-03	1	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed sign-in restrictions buttons not toggling active state Closes #35882 See merge request !13270
\| * \| \| \| \|	Fixed sign-in restrictions buttons not toggling active statefix-oauth-checkboxes	Phil Hughes	2017-08-03	1	-0/+8
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35882
* \| \| \| \|	Change all `:empty_project` to `:project`rs-empty_project-default	Robert Speicher	2017-08-02	170	-211/+211
\|/ / / /
* \| \| \|	Merge branch 'rs-empty_project-cleanup' into 'master'	Rémy Coutable	2017-08-02	7	-8/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure all project factories use `:repository` trait or `:empty_project` See merge request !13238
\| * \| \| \|	Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanup	Robert Speicher	2017-08-01	7	-8/+8
\| \| \| \| \|
* \| \| \| \|	Add filtered search to group issue dashboard	Clement Ho	2017-08-02	1	-5/+5
\|/ / / /
* \| \| \|	Merge branch '28283-legacy-storage-format' into 'master'	Sean McGivern	2017-08-01	3	-29/+29
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Added Legacy Storage format See merge request !13149
\| * \| \| \|	Rename more path_with_namespace -> full_path or disk_path	Gabriel Mazetto	2017-08-01	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Rename many path_with_namespace -> full_path	Gabriel Mazetto	2017-08-01	2	-28/+28
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Inline script cleanup globals and easy	Tim Zallmann	2017-08-01	1	-2/+2
\|/ / /