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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add blurb about changing MRs to WIP through commitsosw-wip-commit-docs	Oswaldo Ferreira	2018-02-04	1	-1/+2
\|
*	Merge branch 'jramsay-42598-fix-subgroup-creation-docs' into 'master'	Marcia Ramos	2018-02-01	2	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix subgroup creation docs Closes #42598 See merge request gitlab-org/gitlab-ce!16836
\| *	Fix subgroup creation docsjramsay-42598-fix-subgroup-creation-docs	James Ramsay	2018-01-31	2	-1/+2
\| \|
* \|	Merge branch '41710-improve-automatic-ce-ee-merge-docs' into 'master'	Sean McGivern	2018-02-01	1	-8/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Clarify the wording around CE to EE ports: backport/upport/upstream merge etc." Closes #41710 See merge request gitlab-org/gitlab-ce!16850
\| * \|	Improve doc/development/automatic_ce_ee_merge.md	Rémy Coutable	2018-02-01	1	-8/+23
\|/ / \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch '30106-group-issues' into 'master'	Sean McGivern	2018-02-01	8	-51/+200
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	View all issues of all subgroups on the group issue page Closes #30106 and #39388 See merge request gitlab-org/gitlab-ce!16706
\| * \|	Include subgroup issuables on the group page30106-group-issues	Jarka Kadlecová	2018-02-01	8	-51/+200
\| \| \|
* \| \|	Merge branch '42497-rubocop-style-regexpliteral' into 'master'	Rémy Coutable	2018-02-01	84	-149/+156
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Style/RegexpLiteral cop Closes #42497 See merge request gitlab-org/gitlab-ce!16752
\| * \| \|	Enable RuboCop Style/RegexpLiteral	Takuya Noguchi	2018-02-01	84	-149/+156
\| \| \| \|
* \| \| \|	Merge branch 'fix-internationalization-namespace' into 'master'	Filipa Lacerda	2018-02-01	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove namespaced internationalization import See merge request gitlab-org/gitlab-ce!16838
\| * \| \| \|	Remove namespaced internationalization importfix-internationalization-namespace	Clement Ho	2018-01-31	1	-2/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'sh-remove-universal-darwin'	Stan Hu	2018-01-31	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Remove grpc and google-protobuf platform-specific version markers in ↵	Stan Hu	2018-01-31	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gemfile.lock Closes gitlab-org/omnibus-gitlab#3128
* \| \| \| \|	Merge branch 'qa-160' into 'master'	Robert Speicher	2018-02-01	2	-2/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a QA scenario for creating an issue Closes gitlab-qa#160 See merge request gitlab-org/gitlab-ce!16802
\| * \| \| \| \|	Add a QA scenario for creating an issueqa-160	Rémy Coutable	2018-01-31	2	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'axios-find-file' into 'master'	Fatih Acet	2018-02-01	1	-13/+11
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace $.ajax in find file with axios See merge request gitlab-org/gitlab-ce!16841
\| * \| \| \| \|	Replace $.ajax in find file with axiosaxios-find-file	Clement Ho	2018-01-31	1	-13/+11
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'axios-calendar' into 'master'	Fatih Acet	2018-01-31	1	-9/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace $.ajax in activity calendar with axios See merge request gitlab-org/gitlab-ce!16839
\| * \| \| \| \|	Replace $.ajax in activity calendar with axiosaxios-calendar	Clement Ho	2018-01-31	1	-9/+14
\| \|/ / / /
* \| \| \| \|	Merge branch 'repository-log-disable-walk' into 'master'	Douwe Maan	2018-01-31	3	-63/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Rugged::Walk implementation of #log See merge request gitlab-org/gitlab-ce!16798
\| * \| \| \|	Remove Rugged::Walk implementation of #logrepository-log-disable-walk	Jacob Vosmaer	2018-01-31	3	-63/+2
\| \| \| \| \|
* \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \|