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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Rémy Coutable	2016-05-19	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed advice on invalid permissions on upload path When running the checks, my upload path has wrong permissions, the advice could not fix it because it does not change the permission of this directory (only sub-directories). ``` Uploads directory setup correctly? ... no Try fixing it: sudo find /home/git/gitlab/public/uploads -type d -not -path /home/git/gitlab/public/uploads -exec chmod 0700 {} \; For more information see: doc/install/installation.md in section "GitLab" Please fix the error above and rerun the checks. ``` Executing this instead fixed the error : ``` sudo chmod 700 /home/git/gitlab/public/uploads ``` See merge request !2948
\| * \| \| \| \| \| \|	Added CHANGELOG entry	Ludovic Perrine	2016-05-19	1	-0/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'mooreniemi/gitlab-ce-issue_15236' into 'master'	Robert Speicher	2016-05-19	1	-0/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changing the confidentiality of an issue now creates a new system note Closes #15236. See merge request !4189
\| * \| \| \| \| \|	Changing the confidentiality of an issue now creates a new system note	Alex Moore-Niemi	2016-05-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Fix changelog for 7.9.3 [ci-skip]	Robert Schilling	2016-05-18	1	-8/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '15640-confidential-issue' into 'master'	Rémy Coutable	2016-05-18	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix atom feeds and links 1. The atom feed for a group's issues didn't work, because it had parts copied from the dashboard issues builder template. 2. The feed link from a group's activity page went to the dashboard feed, rather than the group's feed. Closes #15640 See merge request !4191
\| * \| \| \| \| \| \|	Link to group feed from group activity page	Sean McGivern	2016-05-18	1	-0/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Move to the latest version in the CHANGELOG	Jeroen van Baarsen	2016-05-18	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add changelog entry	Jeroen van Baarsen	2016-05-18	1	-3/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Improve issue formatting in Slack service	Jeroen van Baarsen	2016-05-18	1	-0/+3
\| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \| \| \| \|	Fix 8.7.6 CHANGELOG	Rémy Coutable	2016-05-18	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'fix/import-data-issue' into 'master'	Rémy Coutable	2016-05-18	1	-0/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create import data in service and fix timing issues when scheduling job Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17401 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17376 See merge request !4106
\| * \| \| \| \|	fix merge conflict	James Lopez	2016-05-12	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-05-12	1	-0/+9
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/import-data-issue
\| * \| \| \| \| \|	looks like 8.7.6	James Lopez	2016-05-12	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	updated changelog	James Lopez	2016-05-12	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	added changelog	James Lopez	2016-05-12	1	-0/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue_17302' into 'master'	Rémy Coutable	2016-05-18	1	-0/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix api leaking notes when user is not authorized to read noteable fixes #17302 See merge request !4102
\| * \| \| \| \| \|	Fix api leaking notes when user is not authorized to read noteable	Felipe Artur	2016-05-09	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	added CHANGELOGfix/gitlab-import-data	James Lopez	2016-05-17	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Instrument all Grape API helpers	Yorick Peterse	2016-05-17	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue_14684' into 'master'	Douwe Maan	2016-05-16	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
\| * \| \| \| \| \| \|	fix default send confirmation value	Felipe Artur	2016-05-16	1	-2/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix changelog file	Felipe Artur	2016-05-16	1	-2/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change skip_user_confirmation_email to send_user_confirmation_email	Felipe Artur	2016-05-16	1	-1/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Toggle email signup confirmation in admin settings	Felipe Artur	2016-05-16	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'wiki-fix-reloaded' into 'master'	Rémy Coutable	2016-05-16	1	-0/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the relative url prefix for links in Wiki Retry of gitlab-org/gitlab-ce!4026 @rymai !4050 solved all other problems how it looks like. I [tested](https://gitlab.com/artem-forks/gitlab-ce/commit/ff01eca7b559efa7cacf3412aa01cd8ae8a6db7e/builds) this with ruby22 Fixes #17071 See merge request !4131
\| * \| \| \| \| \| \| \|	Use the relative url prefix for links in Wiki	Artem Sidorenko	2016-05-13	1	-0/+3
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'unexpected-filtering-on-merge-requests' into 'master'	Rémy Coutable	2016-05-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests for unintentional filtering bug in MR !3872 has a lack of tests for Merge Requests while !3872 has only ones for Issues. This MR has complementary tests for MR list. See merge request !4154
\| * \| \| \| \| \| \| \|	Add tests for unintentional filtering bug in MR (cf. !3872)	Takuya Noguchi	2016-05-15	1	-1/+1
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2016-05-16	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'17227-upcoming-milestone-is-confusing-when-projects-have-different-milestones' into 'master' Make upcoming milestone work across projects Before: we took the next milestone due across all projects in the search and found issues whose milestone title matched that one. Problems: 1. The milestone could be closed. 2. Different projects have milestones with different schedules. 3. Different projects have milestones with different titles. 4. Different projects can have milestones with different schedules, but the _same_ title. That means we could show issues from a past milestone, or one that's far in the future. After: gather the ID of the next milestone on each project we're looking at, and find issues with those milestone IDs. Problems: 1. For a lot of projects, this can return a lot of IDs. 2. The SQL query has to be different between Postgres and MySQL, because MySQL is much more lenient with HAVING: as well as the columns appearing in GROUP BY or in aggregate clauses, MySQL allows them to appear in the SELECT list (un-aggregated). Closes #17227. See merge request !4125
\| * \| \| \| \| \| \| \|	Make upcoming milestone work across projects	Sean McGivern	2016-05-16	1	-0/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before: we took the next milestone due across all projects in the search and found issues whose milestone title matched that one. Problems: 1. The milestone could be closed. 2. Different projects have milestones with different schedules. 3. Different projects have milestones with different titles. 4. Different projects can have milestones with different schedules, but the _same_ title. That means we could show issues from a past milestone, or one that's far in the future. After: gather the ID of the next milestone on each project we're looking at, and find issues with those milestone IDs. Problems: 1. For a lot of projects, this can return a lot of IDs. 2. The SQL query has to be different between Postgres and MySQL, because MySQL is much more lenient with HAVING: as well as the columns appearing in GROUP BY or in aggregate clauses, MySQL allows them to appear in the SELECT list (un-aggregated).
* \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2016-05-16	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login' into 'master' Force password change after admin reset Closes #13691. See merge request !4016
\| * \| \| \| \| \| \| \|	Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login	Sean McGivern	2016-05-16	1	-0/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When an admin changes a user's password for them, force the user to reset the password after logging in by expiring the new password immediately.
* \| \| \| \| \| \| \|	Merge branch 'docker-registry' into 'master'	Douwe Maan	2016-05-16	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/master' into docker-registry	Kamil Trzcinski	2016-05-13	1	-0/+35
\| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # config/initializers/1_settings.rb
\| * \| \| \| \| \| \| \|	Added CHANGELOG entry	Kamil Trzcinski	2016-05-09	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'gh-pull-requests'	Douwe Maan	2016-05-16	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update CHANGELOG	Douglas Barbosa Alexandre	2016-05-13	1	-0/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add cache count metrics to rails cacheadd-cache-count-metrics	Pablo Carranza	2016-05-15	1	-0/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Add UI changes in 8.8 to changelogdz-update-changelog	Dmitriy Zaporozhets	2016-05-13	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'default-scope-on-builds-page' into 'master'	Robert Speicher	2016-05-12	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a description for default scope on builds Should be "*All builds (from this project)" for the {project,admin} builds page without scope. Fix a regression on !2243 (#4240). See merge request !4118
\| * \| \| \| \| \| \|	Fix a description for default scope on builds	Takuya Noguchi	2016-05-13	1	-0/+1
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'feature/label-subscription-api' into 'master'	Douwe Maan	2016-05-12	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API endpoints for un/subscribing from/to a label See merge request !4051
\| * \| \| \| \| \| \|	Add API endpoints for un/subscribing from/to a label	Ahmad Sherif	2016-05-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15638
* \| \| \| \| \| \| \|	Merge branch 'health-check-route'	Douwe Maan	2016-05-12	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \|	Add Changelog entryhealth-check-route	DJ Mountney	2016-05-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed
* \| \| \| \| \| \| \|	Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'	Douwe Maan	2016-05-12	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	credits for !4034	Andrei Gliga	2016-05-12	1	-2/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Allow Admins to remove the Login with buttons for OAuth services and still ↵	Andrei Gliga	2016-05-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	be able to import on the changelog