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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '50824-fix-prepend-concern' into 'master'	Robert Speicher	2018-09-14	2	-8/+6
\|\ \| \| \| \| \| \| \| \|	CE: Properly implement prepending for Concern See merge request gitlab-org/gitlab-ce!21444
\| *	Fix how we use EE::ProtectedRefAccess	Lin Jen-Shin	2018-09-11	2	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \|	This is a mess... Using prepend will give a different ancestors chain we're not expecting. To fix this we'll need to know what exactly methods we want to use in each classes using this module.
* \|	Merge branch 'fix-rubocop-master-failures' into 'master'	Robert Speicher	2018-09-14	3	-4/+12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Cleaned up CI runner administration code See merge request gitlab-org/gitlab-ce!21741
\| * \|	Cleaned up CI runner administration code	Yorick Peterse	2018-09-14	3	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19625 some changes were introduced that do not meet our abstraction reuse rules. This commit cleans up some of these changes so the requirements are met. Most notably, sorting of the runners in Admin::RunnersFinder has been delegated to Ci::Runner.order_by, similar to how we order data in models that include the Sortable module. If we need more sort orders in the future we can include Sortable and have Ci::Runner.order_by call `super` to delegate to Sortable.order_by.
* \| \|	Resolve "Username alignment issue on MR page"	Martin Wortschack	2018-09-14	2	-2/+3
\|/ /
* \|	Resolve "Add functionality to change what email address online actions ↵	Nick Thomas	2018-09-14	4	-2/+49
\| \| \| \| \| \| \| \|	commit using"
* \|	Merge branch '31887-remove-images-from-todos' into 'master'	Douwe Maan	2018-09-14	1	-3/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove images from todos" Closes #31887 See merge request gitlab-org/gitlab-ce!21704
\| * \|	Remove images in 'first_line_in_markdown'	Brett Walker	2018-09-13	1	-3/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By default, we now strip images in the 'first_line_in_markdown' method. This keeps images from being displayed in the one-liner of both todo and project activity panels. Although not currently used, we allow images to be preserved with the allow_images: true options.
* \| \|	Merge branch 'revert-f87809f7' into 'master'	Dmitriy Zaporozhets	2018-09-14	1	-9/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'dz-add-project-id-to-jupyter' into 'master'" See merge request gitlab-org/gitlab-ce!21722
\| * \| \|	Revert "Merge branch 'dz-add-project-id-to-jupyter' into 'master'"	Dmitriy Zaporozhets	2018-09-13	1	-9/+0
\| \|/ / \| \| \| \| \| \|	This reverts merge request !21341
* \| \|	Merge branch 'feature/runner-state-filter-for-admin-view' into 'master'	Grzegorz Bizon	2018-09-14	20	-168/+352
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature: State filter for admin runners view See merge request gitlab-org/gitlab-ce!19625
\| * \| \|	add a comment to the usage of a anti-pattern query	Alexis Reigel	2018-09-13	1	-0/+6
\| \| \| \|
\| * \| \|	rename variable from _cnt to _count	Alexis Reigel	2018-09-12	2	-2/+2
\| \| \| \|
\| * \| \|	rename to IssuableFilteredSearchTokenKeys	Alexis Reigel	2018-08-29	6	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it's used for both issues and merge requests
\| * \| \|	use default value arguments syntax	Alexis Reigel	2018-08-29	1	-4/+4
\| \| \| \|
\| * \| \|	dry up view by using a for loop	Alexis Reigel	2018-08-29	1	-9/+2
\| \| \| \|
\| * \| \|	dry up view by extracting layout template	Alexis Reigel	2018-08-29	2	-61/+47
\| \| \| \|
\| * \| \|	enable frozen string literal on runners finder	Alexis Reigel	2018-08-29	1	-0/+2
\| \| \| \|
\| * \| \|	add i18n support to admin runners page	Alexis Reigel	2018-08-29	2	-48/+52
\| \| \| \|
\| * \| \|	show number of runners indicator as callout	Alexis Reigel	2018-08-29	1	-6/+4
\| \| \| \|
\| * \| \|	convert admin runners table to responsive table	Alexis Reigel	2018-08-29	2	-66/+90
\| \| \| \|
\| * \| \|	add sort dropdown to admin runners page	Alexis Reigel	2018-08-29	5	-4/+36
\| \| \| \|
\| * \| \|	use filtered search bar for admin runners	Alexis Reigel	2018-08-29	8	-27/+87
\| \| \| \|
\| * \| \|	make FilteredSearchTokenKeys generic	Alexis Reigel	2018-08-20	7	-92/+112
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for the current usage for the issues search bar a specific instance of FilteredSearchTokenKeys is created, which contains the config for that case.
\| * \| \|	extract filter/sort/paging logic to finder class	Alexis Reigel	2018-08-20	2	-5/+43
\| \| \| \|
\| * \| \|	add status filter to admin runners page	Alexis Reigel	2018-08-20	3	-7/+25
\| \| \| \|
\| * \| \|	dry up available scopes to constants	Alexis Reigel	2018-08-20	1	-1/+3
\| \| \| \|
\| * \| \|	add offline scope to Ci::Runner	Alexis Reigel	2018-08-20	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch 'ccr/50483_add_filter_for_group_milestones' into 'master'	Grzegorz Bizon	2018-09-14	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter group milestones based on user membership. See merge request gitlab-org/gitlab-ce!21660
\| * \| \| \|	Filter group milestones based on user membership	Chantal Rollison	2018-09-13	2	-2/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Create specs for diffs/components/app and update modules to export factory ↵	Paul Slaughter	2018-09-14	5	-16/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	functions
* \| \| \|	Merge branch 'frozen-string-app-finders-graphql' into 'master'	Stan Hu	2018-09-13	69	-0/+138
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable frozen string in app/graphql + app/finders See merge request gitlab-org/gitlab-ce!21681
\| * \| \| \|	Enable frozen string in app/graphql + app/finders	gfyoung	2018-09-11	69	-0/+138
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partially addresses #47424.
* \| \| \| \|	Merge branch 'mr-fixed-expanded-state-not-working' into 'master'	Mike Greiling	2018-09-13	1	-6/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed resolved discussions not toggling expanded on changes tab Closes #51370 See merge request gitlab-org/gitlab-ce!21676
\| * \| \| \|	Fixed resolved discussions not toggling expanded	Phil Hughes	2018-09-13	1	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51370
* \| \| \| \|	Merge branch 'rubocop-code-reuse' into 'master'	Robert Speicher	2018-09-13	328	-32/+1152
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add RuboCop cops to enforce code reusing rules See merge request gitlab-org/gitlab-ce!21391
\| * \| \| \| \|	Disable existing offenses for the CodeReuse cops	Yorick Peterse	2018-09-11	328	-32/+1152
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* \| \| \| \|	Merge branch '7573-show-click-to-expand-on-not-rendered-diffs' into 'master'	Phil Hughes	2018-09-13	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display click to expand on collapsed diffs Closes #51466 See merge request gitlab-org/gitlab-ce!21716
\| * \| \| \| \|	Display click to expand on collapsed diffs	André Luís	2018-09-13	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Resolve "Choosing “Initialize repo with a README” breaks project created ↵	Martin Wortschack	2018-09-13	3	-11/+13
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from template"
* \| \| \| \|	Merge branch ↵	Grzegorz Bizon	2018-09-13	4	-15/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42861-move-include-external-files-in-gitlab-ci-yml-from-starter-to-libre' into 'master' Resolve "Move "include external files in .gitlab-ci.yml" from Starter to Libre" Closes #42861 See merge request gitlab-org/gitlab-ce!21603
\| * \| \| \| \|	Inline initialize_yaml_processor	Matija Čupić	2018-09-12	1	-5/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Address MR suggestions	Matija Čupić	2018-09-07	3	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE mirror of c4578b951e331fe8c75cd4f948ce74cec6587bad
\| * \| \| \| \|	Improve external architecture	Matija Čupić	2018-09-07	3	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE mirror of 4f17c7b2c30188302e6a73421acbf5a09fb2c823
\| * \| \| \| \|	Make Repository#blob_data_at public	Matija Čupić	2018-09-07	1	-12/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE mirror of 17de13ada1a98da060802c55889489a512183cd1
\| * \| \| \| \|	Change ExternalFile to retrieve local file from repository instead of GitLab ↵	Matija Čupić	2018-09-07	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	project CE mirror of 03c6094997023d9c8875ced421a6c9ef39a4af44
\| * \| \| \| \|	Import external files in Gitlab CI config	Matija Čupić	2018-09-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE mirror of a10b777f8cb1902bba3964a4cbad2b1dd6bce785
* \| \| \| \| \|	Merge branch 'sh-strip-sentry-dsn' into 'master'	Robert Speicher	2018-09-12	1	-0/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Strip whitespace from Sentry URL Closes #49621 See merge request gitlab-org/gitlab-ce!21703
\| * \| \| \| \| \|	Strip whitespace from Sentry URL	Stan Hu	2018-09-12	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding extra whitespace in the DSN could prevent the server from starting due to InvalidURIErrors in sentry-raven. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49621
* \| \| \| \| \| \|	Resolve "500 Internal Server Error: Deleting branch of deleted project"	🙈 jacopo beschi 🙉	2018-09-12	1	-0/+5
\|/ / / / / /