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

	Commit message (Collapse)	Author	Age	Files	Lines
*	un-index old blog post from doc, add the important content from the post to ↵docs-pages-https	Marcia Ramos	2018-01-31	2	-5/+29
\| \| \| \|	the docs
*	Merge branch ↵	Rémy Coutable	2018-01-31	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'4761-follow-up-from-resolve-developers-should-be-able-to-create-new-projects-in-group' into 'master' Refactor groups controller to match EE Closes gitlab-ee#4761 See merge request gitlab-org/gitlab-ce!16832
\| *	refactor groups controller to match EE4761-follow-up-from-resolve-developers-should-be-able-to-create-new-projects-in-group	James Lopez	2018-01-31	1	-2/+2
\| \|
* \|	Merge branch 'fix-install-docs' into 'master'	Nick Thomas	2018-01-31	3	-5/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix example commands to refer to the correct versions See merge request gitlab-org/gitlab-ce!16683
\| * \|	[ci skip] Fix example commands to refer to the correct versions	Alejandro Rodríguez	2018-01-31	3	-5/+10
\|/ /
* \|	Merge branch 'fl-mr-widget' into 'master'	Phil Hughes	2018-01-31	5	-122/+94
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Move mr widget related links into a vue file See merge request gitlab-org/gitlab-ce!16825
\| * \|	Fix broken testfl-mr-widget	Filipa Lacerda	2018-01-31	2	-3/+3
\| \| \|
\| * \|	Move mr widget related links into a vue file	Filipa Lacerda	2018-01-30	5	-123/+95
\| \| \|
* \| \|	Merge branch 'axios-get-render-math' into 'master'	Phil Hughes	2018-01-31	1	-13/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace $.get in render math with axios See merge request gitlab-org/gitlab-ce!16697
\| * \| \|	Replace $.get in render math with axiosaxios-get-render-math	Clement Ho	2018-01-30	1	-13/+25
\| \| \| \|
* \| \| \|	Merge branch 'axios-common-utils-favicon' into 'master'	Fatih Acet	2018-01-31	3	-39/+38
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Use axios instead of jquery ajax for setCiStatusFavicon See merge request gitlab-org/gitlab-ce!16784
\| * \| \|	Use axios instead of jquery ajax for setCiStatusFavicon	Clement Ho	2018-01-31	3	-39/+38
\|/ / /
* \| \|	Merge branch 'rugged-reference-cache-rescue' into 'master'	Sean McGivern	2018-01-31	4	-18/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop rescuing Rugged::Reference in Repository cache See merge request gitlab-org/gitlab-ce!16770
\| * \| \|	Remove Rugged exception in cache rescuerugged-reference-cache-rescue	Jacob Vosmaer	2018-01-30	4	-18/+14
\| \| \| \|
* \| \| \|	Merge branch 'sh-fix-project-members-api-perf' into 'master'	Rémy Coutable	2018-01-31	6	-30/+46
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints See merge request gitlab-org/gitlab-ce!16751
\| * \| \| \|	Remove N+1 queries with /projects/:project_id/{access_requests,members} API ↵sh-fix-project-members-api-perf	Stan Hu	2018-01-30	6	-30/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	endpoints We can simplify the code quite a bit and improve performance by using grape-entity merge fields: https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields Relates to #42030
* \| \| \| \|	Merge branch 'zj-gitaly-server-info' into 'master'	Sean McGivern	2018-01-31	11	-102/+551
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly Server info for admin panel See merge request gitlab-org/gitlab-ce!16794
\| * \| \| \| \|	Gitaly Server info for admin panel	Zeger-Jan van de Weg	2018-01-31	13	-106/+555
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements the client side for gitlab-org/gitaly#819. Which is a server info command. This checks the server version and git binairy version on the server. A small UI was added for administrators, so they can check the status of the Gitaly server. This is done for each storage the monolith knows. Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That MR removed the Git version too, but didn't replace it with anything.
* \| \| \| \| \|	Merge branch 'qa-new-dropzone-component' into 'master'	Grzegorz Bizon	2018-01-31	4	-17/+41
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce a new QA::Gitlab::Page::Component::Dropzone class See merge request gitlab-org/gitlab-ce!16805
\| * \| \| \| \| \|	Introduce a new QA::Gitlab::Page::Component::Dropzone class	Rémy Coutable	2018-01-31	4	-17/+41
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'	Grzegorz Bizon	2018-01-31	2	-1/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move Repository#can_be_merged? to Gitlab::Git::Repository Closes #42544 See merge request gitlab-org/gitlab-ce!16771
\| * \| \| \| \| \|	Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-git	Ahmad Sherif	2018-01-30	2	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #42544
* \| \| \| \| \| \|	Merge branch 'sh-fix-events-collection' into 'master'	Rémy Coutable	2018-01-31	3	-1/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix not all events being shown in group dashboard Closes #42560 See merge request gitlab-org/gitlab-ce!16819
\| * \| \| \| \| \| \|	Fix not all events being shown in group dashboardsh-fix-events-collection	Stan Hu	2018-01-30	3	-1/+29
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The group activity feed was limited to the first 20 projects found in the group, which caused activity from some projects to be omitted. A limit of 20 is applied to the query for events, so the extra pagination does little in the way of performance. Closes #42560
* \| \| \| \| \| \|	Merge branch 'rc/remove-brakeman-from-codequality' into 'master'	Dmitriy Zaporozhets	2018-01-31	1	-2/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job See merge request gitlab-org/gitlab-ce!16808
\| * \| \| \| \| \| \|	Remove brakeman from .codeclimate.yml since it's now covered by the sast CI jobrc/remove-brakeman-from-codequality	Rémy Coutable	2018-01-30	1	-2/+0
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '42239-fix-mysql-source-installs' into 'master'	Rémy Coutable	2018-01-31	2	-44/+48
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "mysql-only installation from source broken: Gem::LoadError: pg is not part of the bundle" Closes #42239 See merge request gitlab-org/gitlab-ce!16810
\| * \| \| \| \| \| \|	Don't assume postgresql in two initializers	Nick Thomas	2018-01-30	2	-44/+48
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '4635-unify-jobs-and-builds-sepc' into 'master'	Rémy Coutable	2018-01-31	2	-52/+73
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify and split CE/EE for spec/requests/api/jobs_spec.rb See merge request gitlab-org/gitlab-ce!16804
\| * \| \| \| \| \| \| \|	Make those files as close as EE to reduce conflicts4635-unify-jobs-and-builds-sepc	Lin Jen-Shin	2018-01-31	2	-52/+73
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'update-qa-docs-with-directory-req' into 'master'	Grzegorz Bizon	2018-01-31	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about needing to be in the `$gdk/gitlab/qa` directory for `bin/qa` to work properly See merge request gitlab-org/gitlab-ce!16824 [ci skip]
\| * \| \| \| \| \| \| \| \|	Add note about being in the `qa` directory for `bin/qa` to workupdate-qa-docs-with-directory-req	Eric Eastwood	2018-01-31	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I ran into some issues when trying it out https://gitlab.slack.com/archives/C3JJET4Q6/p1517384135000134
* \| \| \| \| \| \| \| \| \|	Merge branch 'ph-ajax-to-axios' into 'master'	Filipa Lacerda	2018-01-31	15	-284/+230
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Converted $.ajax calls in some JS files to axios See merge request gitlab-org/gitlab-ce!16717
\| * \| \| \| \| \| \| \| \| \|	fixed failing specsph-ajax-to-axios	Phil Hughes	2018-01-30	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	potential fix for tests crashing	Phil Hughes	2018-01-30	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use underscore noop instead of jquery
\| * \| \| \| \| \| \| \| \| \|	EE backport for callback being optional	Phil Hughes	2018-01-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	more EE backports	Phil Hughes	2018-01-30	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	backported changed from EE	Phil Hughes	2018-01-30	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fixed failing IDE test	Phil Hughes	2018-01-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fixed more unhandled promise rejections	Phil Hughes	2018-01-30	2	-5/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fixed unhandled promise rejection	Phil Hughes	2018-01-30	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	changed commits.js to axios	Phil Hughes	2018-01-30	2	-28/+49
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	converted blob viewer to axios	Phil Hughes	2018-01-30	2	-33/+25
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	spec fixes after API axios change	Phil Hughes	2018-01-30	3	-11/+19
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Converted API.js to axios	Phil Hughes	2018-01-30	5	-200/+102
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-42499-api-repo-archive-format-param' into 'master'	Achilleas Pipinellis	2018-01-31	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document format parameter for Repository Archive endpoint Closes #42499 See merge request gitlab-org/gitlab-ce!16766
\| * \| \| \| \| \| \| \| \| \|	Document format parameter for Repository Archive endpoint	Mark Fletcher	2018-01-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/add-support-for-pre-receive-error-in-merge-branch' into ↵42613-clean-up-old-project-permissions-frontend-code 42242-clean-up-error-handling-in-project-permissions-page	Robert Speicher	2018-01-30	1	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add support for PreReceiveError in UserMergeBranch RPC Closes gitaly#979 See merge request gitlab-org/gitlab-ce!16765
\| * \| \| \| \| \| \| \| \| \| \|	Add support for PreReceiveError in UserMergeBranch RPCfix/add-support-for-pre-receive-error-in-merge-branch	Ahmad Sherif	2018-01-30	4	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#979
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/migrate-delete-refs-to-gitaly' into 'master'	Robert Speicher	2018-01-30	7	-38/+59
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Git::Repository#delete_refs to Gitaly Closes gitaly#967 See merge request gitlab-org/gitlab-ce!16723