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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '46246-gitlab-project-export-should-use-object-storage' into ↵	Sean McGivern	2018-07-06	1	-5/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "GitLab Project export should use object storage" Closes #46246 See merge request gitlab-org/gitlab-ce!20105
\| *	Update Import/Export to use object storage (based on aa feature flag)	James Lopez	2018-07-06	1	-5/+12
\| \|
* \|	Use proper markdown rendering for previews	Brett Walker	2018-07-06	1	-0/+2
\| \|
* \|	Preload ancestors after pagination when filtering	Bob Van Landuyt	2018-07-06	1	-14/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to preload the ancestors of search results after applying pagination limits. This way the search results itself are paginated, but not the ancestors. If we don't do this, we might not preload a parent group of a search result as it has been cut off by pagination.
* \|	Merge branch 'ce-5605-epic-autocomplete' into 'master'	Sean McGivern	2018-07-06	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \|	Backport of EE changes "Add support for autocompleting Epics and Labels within Epics" See merge request gitlab-org/gitlab-ce!20419
\| *	Backport of EE changes in ↵	Mark Chao	2018-07-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6195 Refactor AutocompleteSources#label: 1. The return value was inconsistent, sometimes returning a hash and sometimes returning an ActiveModel. 2. It was inconsistent with respect to other methods in the class since they all return ActiveModels.
* \|	Fix User role displayed on projects dashboard	Francisco Javier López	2018-07-06	1	-2/+3
\|/
*	Merge branch '31583-osw-gfm-complete-status-indication' into 'master'	Sean McGivern	2018-07-06	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "GFM preview should have status indicator" Closes #31583 See merge request gitlab-org/gitlab-ce!20418
\| *	Present state indication on GFM preview	Oswaldo Ferreira	2018-07-05	1	-0/+1
\| \|
* \|	Web Terminal Ci Build	Francisco Javier López	2018-07-05	1	-2/+20
\| \|
* \|	Merge branch '45739-add-metrics-to-operations-tab' into 'master'	Filipa Lacerda	2018-07-04	1	-0/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add Metrics to Operations Tab" Closes #45739 See merge request gitlab-org/gitlab-ce!20025
\| * \|	Makes production environment the default environment for a project	Tiago Botelho	2018-07-04	1	-1/+1
\| \| \|
\| * \|	Remove GET empty from EnvironmentsController	Tiago Botelho	2018-06-29	1	-12/+5
\| \| \|
\| * \|	Prevents project first environment from being fetched in every project view	Tiago Botelho	2018-06-28	5	-8/+14
\| \| \|
\| * \|	Specify environment actions to distinguish between metrics and every other ↵	Tiago Botelho	2018-06-26	3	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \|	environment related actions
\| * \|	Adds empty environments page	Tiago Botelho	2018-06-26	3	-4/+8
\| \| \|
\| * \|	Adds metrics to Operartions tab in projects sidebar	Tiago Botelho	2018-06-26	2	-0/+6
\| \| \|
* \| \|	Merge branch '19468-add_readme_when_creating_project' into 'master'	Douwe Maan	2018-07-04	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add option to add README when creating a project Closes #19468 See merge request gitlab-org/gitlab-ce!20335
\| * \| \|	Add option to add README when creating a project	Imre Farkas	2018-07-04	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch '43446-new-cluster-page-tabs' into 'master'	Kamil Trzciński (OoO till 3th)	2018-07-04	3	-117/+112
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Change new cluster page design to use tabs" Closes #43446 and #46304 See merge request gitlab-org/gitlab-ce!18963
\| * \ \ \	Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs	Dennis Tang	2018-06-21	3	-4/+4
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs	Dennis Tang	2018-06-19	33	-104/+270
\| \|\ \ \ \ \
\| * \| \| \| \| \|	consolidate back into one controller	Dennis Tang	2018-06-19	3	-90/+109
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	rubocop fix	Dennis Tang	2018-06-06	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	redirect back to form if token expires	Dennis Tang	2018-06-05	1	-9/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	split into gcp and user controllers again	Dennis Tang	2018-06-05	3	-110/+89
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs	Dennis Tang	2018-06-01	5	-13/+32
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/user/project/clusters/index.md
\| * \ \ \ \ \ \	Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs	Dennis Tang	2018-05-31	3	-6/+30
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/_merge_request_merge_method_settings.html.haml
\| * \| \| \| \| \| \| \|	Adjust permitted params filtering on merge scheduling	Oswaldo Ferreira	2018-05-31	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs	Dennis Tang	2018-05-31	8	-9/+55
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/projects/clusters/gcp_controller.rb # app/views/projects/clusters/gcp/_form.html.haml # app/views/projects/clusters/gcp/login.html.haml
\| * \| \| \| \| \| \| \| \|	update view name for gke dropdown check	Dennis Tang	2018-05-26	1	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix case where token may expire	Dennis Tang	2018-05-26	1	-2/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	cleanup	Dennis Tang	2018-05-26	1	-4/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	revisions	Dennis Tang	2018-05-26	1	-33/+20
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	combine "create" and "existing" GKE cluster views into one new page	Dennis Tang	2018-05-26	3	-117/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/projects/clusters/gcp_controller.rb # app/views/projects/clusters/gcp/_form.html.haml
* \| \| \| \| \| \| \| \| \|	Merge branch 'ee-5481-epic-todos' into 'master'	Sean McGivern	2018-07-04	3	-11/+17
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of Todos for epics See merge request gitlab-org/gitlab-ce!19908
\| * \| \| \| \| \| \| \| \| \|	More EE->CE fixes	Jan Provaznik	2018-07-03	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	[backend] Addressed review comments	Jan Provaznik	2018-07-03	3	-11/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Group filtering now includes also issues/MRs from subgroups/subprojects * fixed due_date * Also DRYed todo controller specs
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-is-shared-from-ci-runners' into 'master'	Grzegorz Bizon	2018-07-04	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the use of `is_shared` of `Ci::Runner` See merge request gitlab-org/gitlab-ce!20172
\| * \| \| \| \| \| \| \| \| \| \|	Remove the use of `is_shared` of `Ci::Runner`remove-is-shared-from-ci-runners	Kamil Trzciński	2018-06-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jprovazn-direct-upload' into 'master'	Kamil Trzciński (OoO till 3th)	2018-07-04	3	-2/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add workhorse authorize method for project/group uploads Closes #44663 See merge request gitlab-org/gitlab-ce!19717
\| * \| \| \| \| \| \| \| \| \| \| \|	Add workhorse authorize method for project/group uploads	Jan Provaznik	2018-06-18	3	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This method can be used by workhorse to get presigned URLs used for direct upload of files.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-graphql-pipeline-lists' into 'master'	Douwe Maan	2018-07-04	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pipeline lists to graphql Closes #48469 See merge request gitlab-org/gitlab-ce!20249
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add pipeline lists to GraphQL	Bob Van Landuyt	2018-07-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds Keyset pagination to GraphQL lists. PoC for that is pipelines on merge requests and projects. When paginating a list, the base-64 encoded id of the ordering field (in most cases the primary key) can be passed in the `before` or `after` GraphQL argument.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '47040-inconsistent-job-list-in-job-details-view' into 'master'	Kamil Trzciński (OoO till 3th)	2018-07-04	1	-4/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Inconsistent job list in job details view" Closes #47040 See merge request gitlab-org/gitlab-ce!20243
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use associated build pipeline	Matija Čupić	2018-06-29	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Prometheus metrics to track reCAPTCHA success/failures	Stan Hu	2018-07-03	1	-1/+19
\| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'web-hooks-log-pagination'	Douwe Maan	2018-07-03	1	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Nick Thomas	2018-07-02	1	-1/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'6195-http-git-push-to-secondary-for-git-lfs-currently-does-not-work' into 'master' Prep work to support git/git-lfs redirect to primary See merge request gitlab-org/gitlab-ce!19728
\| \| * \| \| \| \| \| \| \| \| \| \|	Move check logic into #batch_operation_disallowed?	Ash McKenzie	2018-07-02	1	-1/+6
\| \| \|/ / / / / / / / / /