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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Updated snippets testssnippets-ui	Phil Hughes	2016-05-19	2	-4/+4
\|
*	Updated snippets UI	Phil Hughes	2016-05-18	8	-55/+118
\| \| \| \|	Closes #14328
*	Merge branch 'issue_17302' into 'master'	Rémy Coutable	2016-05-18	3	-21/+94
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix api leaking notes when user is not authorized to read noteable fixes #17302 See merge request !4102
\| *	Move note helper method to notes entity fileissue_17302	Felipe Artur	2016-05-17	2	-6/+8
\| \|
\| *	Fix single note api request	Felipe Artur	2016-05-16	3	-8/+23
\| \|
\| *	Fix notes API calls symbol convertions	Felipe Artur	2016-05-10	2	-3/+34
\| \|
\| *	Fix api leaking notes when user is not authorized to read noteable	Felipe Artur	2016-05-09	3	-13/+38
\| \|
* \|	Merge branch 'fix/gitlab-import-data' into 'master'	Robert Speicher	2016-05-17	2	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix typo making gitlab.com importing to fail Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565 See merge request !4181
\| * \|	added CHANGELOGfix/gitlab-import-data	James Lopez	2016-05-17	1	-0/+1
\| \| \|
\| * \|	fix typo from bad refactoring	James Lopez	2016-05-17	1	-1/+1
\|/ /
* \|	Merge branch 'instrument-api-helpers' into 'master'	Rémy Coutable	2016-05-16	2	-0/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument all Grape API helpers This has been added to help us figure out what's making certain Grape API calls slow (e.g. the one used for authorized keys as described in gitlab-com/operations#99). See merge request !4169
\| * \|	Instrument all Grape API helpers	Yorick Peterse	2016-05-17	2	-0/+3
\|/ /
* \|	Merge branch 'dz-fix-sidebar-overlap' into 'master'	Dmitriy Zaporozhets	2016-05-16	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix left sidebar overlap when scroll on long menu Fixes #17566. Caused by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4139. Smaller fix compared to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4164 cc @iamphill @jschatz1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !4165
\| * \|	Fix left sidebar overlap when scroll on long menudz-fix-sidebar-overlap	Dmitriy Zaporozhets	2016-05-16	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'issue_14684' into 'master'	Douwe Maan	2016-05-16	12	-13/+106
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-4/+4
\| \| \| \|
\| * \| \|	Change landing page when skipping confirmation email and add documentation	Felipe Artur	2016-05-16	7	-17/+48
\| \| \| \|
\| * \| \|	Fix changelog file	Felipe Artur	2016-05-16	2	-3/+0
\| \| \| \|
\| * \| \|	Change skip_user_confirmation_email to send_user_confirmation_email	Felipe Artur	2016-05-16	9	-19/+30
\| \| \| \|
\| * \| \|	Toggle email signup confirmation in admin settings	Felipe Artur	2016-05-16	6	-0/+54
\| \|/ /
* \| \|	Merge branch 'rs-event-titles' into 'master'	Douwe Maan	2016-05-16	5	-64/+37
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an Event's target's title to its reference link Given an activity feed entry like: > Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce] ...the `issue #123` link will now have a `title` attribute. Plus some minor refactorings, see individual commits for details. See merge request !4090
\| * \| \|	Reduce duplication and branching logic in EventsHelper	Robert Speicher	2016-05-16	3	-54/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused methods from Event model
\| * \| \|	Rename `Event#note_project_snippet?` to `project_snippet_note?`	Robert Speicher	2016-05-16	2	-3/+3
\| \| \| \|
\| * \| \|	Rename `Event#note_commit?` to `commit_note?`	Robert Speicher	2016-05-16	2	-7/+7
\| \| \| \|
\| * \| \|	Remove redundant `html_escape` calls from `title` attributes	Robert Speicher	2016-05-16	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These get escaped automatically.
\| * \| \|	Fix titles for commit references in Event feed	Robert Speicher	2016-05-16	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, the `title` attribute was being included as an argument to the route helper rather than as an argument to `link_to`.
\| * \| \|	Simplify Event's target type-checking	Robert Speicher	2016-05-16	1	-3/+3
\| \| \| \|
\| * \| \|	Add an Event's target's title to its reference link	Robert Speicher	2016-05-16	4	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given an activity feed entry like: > Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce] ...the `issue #123` link will now have a `title` attribute.
* \| \| \|	Merge branch 'disallow-uploads' into 'master'	Douwe Maan	2016-05-16	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow search engines from indexing uploads from a GitLab project. This can sometimes include sensitive information from private projects and confidential issues. It shouldn't be indexed. Resolves #15551. cc: @DouweM See merge request !4167
\| * \| \| \|	Disallow search engines from indexing uploads from a GitLab project.	Connor Shea	2016-05-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This can sometimes include sensitive information from private projects and confidential issues. It shouldn't be indexed. Resolves #15551.
* \| \| \| \|	Merge branch 'wiki-fix-reloaded' into 'master'	Rémy Coutable	2016-05-16	4	-3/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-3/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'unexpected-filtering-on-merge-requests' into 'master'	Rémy Coutable	2016-05-16	2	-1/+16
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-1/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch ↵	Douwe Maan	2016-05-16	5	-71/+161
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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
\| * \| \| \| \| \|	Return a relation with Postgres17227-upcoming-milestone-is-confusing-when-projects-have-different-milestones	Sean McGivern	2016-05-16	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Postgres only needs to select a single column, so that can used as a sub-query where `Milestone.upcoming_ids_by_projects` is actually used in `IssuableFinder`. MySQL needs to select the `due_date` column because it's used in the `HAVING` clause, so it has to return an array of IDs.
\| * \| \| \| \| \|	Make upcoming milestone work across projects	Sean McGivern	2016-05-16	5	-4/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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).
\| * \| \| \| \| \|	Tidy up IssuesFinder specs	Sean McGivern	2016-05-16	1	-68/+80
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Don't do setup in spec bodies. - Don't `describe` a symbol. - Don't use 'should'.
* \| \| \| \| \|	Merge branch ↵	Robert Speicher	2016-05-16	4	-0/+81
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	4	-0/+81
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	24	-10/+677
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \|	Bring back port to registry configurationdocker-registry	Kamil Trzcinski	2016-05-16	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix offline_token http_status code	Kamil Trzcinski	2016-05-15	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix http status codes for container registry authentication service	Kamil Trzcinski	2016-05-15	2	-13/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve authentication service specs	Kamil Trzcinski	2016-05-15	3	-19/+59
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update JwtController specs	Kamil Trzcinski	2016-05-15	1	-36/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added specs for JwtController	Kamil Trzcinski	2016-05-14	1	-0/+87
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve JwtController	Kamil Trzcinski	2016-05-14	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Rename JWT to JSONWebToken	Kamil Trzcinski	2016-05-14	8	-28/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Simplify JWT::RSAToken::kid	Kamil Trzcinski	2016-05-14	1	-4/+8
\| \| \| \| \| \| \|