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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Optimize `with_artifacts_archive` scope on Ci::Buildbuild-scope-optimization	Alejandro Rodríguez	2018-04-24	1	-2/+2
\|
*	Merge branch 'docs-use_docker_stable_in_examples' into 'master'	Nick Thomas	2018-04-13	9	-21/+21
\|\ \| \| \| \| \| \| \| \|	Use stable docker image instead of latest See merge request gitlab-org/gitlab-ce!18373
\| *	Use stable docker image instead of latest	Philippe Lafoucrière	2018-04-13	9	-21/+21
\|/
*	Merge branch 'svg-1.18' into 'master'	Mike Greiling	2018-04-13	2	-4/+4
\|\ \| \| \| \| \| \| \| \|	Update gitlab-svgs to 1.18.0 See merge request gitlab-org/gitlab-ce!18369
\| *	Update gitlab-svgs to 1.18.0	Clement Ho	2018-04-13	2	-4/+4
\| \|
* \|	Merge branch ↵	Mike Greiling	2018-04-13	2	-4/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'45353-raw-html-is-being-shown-on-the-mr-page-from-performance-widget' into 'master' Resolve "Raw HTML is being shown on the MR page from Performance widget" Closes #45353 See merge request gitlab-org/gitlab-ce!18370
\| * \|	Fix the metrics link being not rendering the html	Jose Ivan Vargas	2018-04-13	2	-4/+3
\|/ /
* \|	Merge branch 'fj-change-gollum-gems-to-custom-ones' into 'master'	Douwe Maan	2018-04-13	5	-220/+23
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Replacing gollum libs for custom gitlab ones See merge request gitlab-org/gitlab-ce!18343
\| * \|	Replacing gollum libs for custom gitlab ones	Francisco Javier López	2018-04-13	5	-220/+23
\|/ /
* \|	Merge branch 'remove-pipe' into 'master'	Douwe Maan	2018-04-13	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove bogus '\|' symbol See merge request gitlab-org/gitlab-ce!18313
\| * \|	Remove bogus '\|' symbol	Jacob Vosmaer (GitLab)	2018-04-13	1	-1/+1
\|/ /
* \|	Merge branch 'ide-mr-changes-alert-box' into 'master'	Filipa Lacerda	2018-04-13	3	-85/+75
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove confirm box when redirecting to new merge request form in IDE Closes #45326 See merge request gitlab-org/gitlab-ce!18362
\| * \|	fixed actions spec	Phil Hughes	2018-04-13	1	-15/+12
\| \| \|
\| * \|	Remove confirm box when redirecting to new merge request form in IDE	Phil Hughes	2018-04-13	3	-74/+67
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #45326
* \| \|	Merge branch 'ide-firefox-scroll-fix' into 'master'	Filipa Lacerda	2018-04-13	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed IDE sidebar not being scrollable in FireFox Closes #45314 See merge request gitlab-org/gitlab-ce!18350
\| * \| \|	Fixed IDE sidebar not being scrollable in FireFox	Phil Hughes	2018-04-12	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #45314
* \| \| \|	Merge branch 'changes-bar-peek-id-change' into 'master'	Filipa Lacerda	2018-04-13	1	-28/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes the ID for the performance bar to correctly sticky the stat bar to the top See merge request gitlab-org/gitlab-ce!18359
\| * \| \| \|	Changes the ID for the performance bar to correctly sticky the stat bar to ↵	Phil Hughes	2018-04-13	1	-28/+21
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	the top
* \| \| \|	Merge branch 'contribute/no-rm-rf-gitlab-basics' into 'master'	Achilleas Pipinellis	2018-04-13	2	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use "-f" with "rm" in Gitlab-Basics Docs Closes #20071 See merge request gitlab-org/gitlab-ce!18027
\| * \| \| \|	Do not use '-f' with 'rm' in gitlab-basics docs	Elias Werberich	2018-03-27	2	-1/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-storage-path-deprecation' into 'master'	Douwe Maan	2018-04-13	3	-8/+23
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deprecate legacy disk paths See merge request gitlab-org/gitlab-ce!18332
\| * \| \| \| \|	Deprecate legacy disk paths	Zeger-Jan van de Weg	2018-04-12	3	-8/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Direct disk access is impossible on environments where components run in their own container. There for constructing the path should not be done except for exceptional cases. One of the considerations, instead of logging, was to use Sentry. For now I've chosen not to use this as the impact of this change is hard to determine. Getting this in now will allow us to checkout the impact on dev.gitlab.org and staging.
* \| \| \| \| \|	Merge branch 'feature/add-language-in-repository-to-api' into 'master'	Douwe Maan	2018-04-13	4	-0/+81
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature/add language in repository to api See merge request gitlab-org/gitlab-ce!17770
\| * \| \| \| \| \|	Feature/add language in repository to api	Roger Rüttimann	2018-04-13	4	-0/+81
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-for-failure-reason-tooltip' into 'master'	Achilleas Pipinellis	2018-04-13	3	-0/+21
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing documentation about failure reason Closes #45300 See merge request gitlab-org/gitlab-ce!18352
\| * \| \| \| \| \|	Add missing documentation about failure reason	Mayra Cabrera	2018-04-13	3	-0/+21
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'jprovazn-fix-references' into 'master'	Douwe Maan	2018-04-13	13	-22/+91
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix reference filters in group context See merge request gitlab-org/gitlab-ce!18340
\| * \| \| \| \|	Fix reference filters in group context	Jan Provaznik	2018-04-12	13	-22/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since !18150 abstract reference filter supports also `group` as a resource parent (not only `project`). Some reference filters, which inherit from abstract filter, depend on parent being `project` when checking a reference. This patch adds explicit check of parent class to the given filters.
* \| \| \| \| \|	Merge branch '30739-fix-joined-information-on-project-members-page' into ↵	Clement Ho	2018-04-12	3	-2/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Weird "joined" information on project members page" Closes #30739 See merge request gitlab-org/gitlab-ce!18290
\| * \| \| \| \| \|	Fix `joined` information on project members page	Fabian Schneider	2018-04-12	3	-2/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs/autodevops-buildpacks' into 'master'	Achilleas Pipinellis	2018-04-12	1	-3/+3
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct wrong buildpacks filename See merge request gitlab-org/gitlab-ce!18336
\| * \| \| \| \| \|	Correct wrong buildpacks filename	Achilleas Pipinellis	2018-04-12	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mentions https://gitlab.com/gitlab-org/gitlab-ee/issues/3768
* \| \| \| \| \| \|	Merge branch 'rename-overview-project-sidenav' into 'master'	Tim Zallmann	2018-04-12	3	-4/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renamed 'Overview' to 'Project' in the contextual navigation at a project level Closes #43430 See merge request gitlab-org/gitlab-ce!18295
\| * \| \| \| \| \| \|	Renamed 'Overview' to 'Project' in the contextual navigation at a project level	Constance Okoghenun	2018-04-12	3	-4/+9
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs-graphs-section-new-frontend-guide' into 'master'	Clement Ho	2018-04-12	1	-1/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the new frontend guide to specify the usage of d3 See merge request gitlab-org/gitlab-ce!18294
\| * \| \| \| \| \| \|	Added d3 documentation for the new fe guide	Jose Ivan Vargas	2018-04-12	1	-1/+19
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '10-7-update-licenses' into 'master'	Rémy Coutable	2018-04-12	1	-64/+65
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the dependencies license list for 10.7 See merge request gitlab-org/gitlab-ce!18339
\| * \| \| \| \| \| \| \|	Update the dependencies license list for 10.7	Filipa Lacerda	2018-04-12	1	-64/+65
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'dm-archived-read-only' into 'master'	Robert Speicher	2018-04-12	91	-297/+935
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make archived projects completely read-only Closes #44788 See merge request gitlab-org/gitlab-ce!18136
\| * \| \| \| \| \| \| \|	Spec improvements for speed, reliability and readability	Bob Van Landuyt	2018-04-12	10	-29/+25
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add matcher for emoji	Bob Van Landuyt	2018-04-11	4	-5/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Show `New Issue` link for projects	Bob Van Landuyt	2018-04-11	10	-10/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user is not logged in, we want to show the `New Issue` link so he gets directed to the login flow first. When a project is archived, we never want to show the link.
\| * \| \| \| \| \| \| \|	Prevent awarding emoji when a project is archived	Bob Van Landuyt	2018-04-11	24	-26/+231
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents performing the requests, and disables all emoji reaction buttons
\| * \| \| \| \| \| \| \|	Correct permissions for creating merge requests from issues	Bob Van Landuyt	2018-04-11	8	-11/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This could only be possible for users that can create merge requests within a project. So they need to be a allowed to create a branch and create a merge request.
\| * \| \| \| \| \| \| \|	Hide file/directory creation buttons	Bob Van Landuyt	2018-04-11	10	-28/+59
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Hide `new merge request` button from index page	Bob Van Landuyt	2018-04-11	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a project is archived, don't show the button on the index page of merge requests
\| * \| \| \| \| \| \| \|	Hide new mr from dropdown for archived projects	Bob Van Landuyt	2018-04-11	3	-1/+100
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Share collaboration check between view and presenter	Bob Van Landuyt	2018-04-11	8	-32/+84
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Rename `create_merge_request` permissions	Bob Van Landuyt	2018-04-11	13	-26/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So we can distinguish between the permissions on the source and the target project. - `create_merge_request_from` indicates a user can create a merge request with the project as a source_project - `create_merge_request_in` indicates a user can create a merge request with the project as a target_project
\| * \| \| \| \| \| \| \|	Prevent new merge requests for archived projects	Bob Van Landuyt	2018-04-11	13	-7/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents creating merge requests targeting archived projects. This could happen when a project was already forked, but then the source was archived.