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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-04-19	2	-7/+7
\|\
\| *	Remove XSS vulnerability in Label and Milestone dropdowns	Robert Speicher	2016-04-19	2	-7/+7
\| \|
* \|	CLearify shared runner warning.	Sytse Sijbrandij	2016-04-19	1	-1/+1
\| \|
* \|	Merge branch '15139-fix-constants-redefinition-warnings' into 'master'	Robert Speicher	2016-04-19	9	-13/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Define constants only if not defined yet and freeze them Fixes #15139. See merge request !3810
\| * \|	Get rid of more requires, which causes warnings when code is reloaded15139-fix-constants-redefinition-warnings	Rémy Coutable	2016-04-19	3	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Remove useless require 'file_size_validator' causing warnings	Rémy Coutable	2016-04-19	6	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Define constants only if not defined yet and freeze them	Rémy Coutable	2016-04-19	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'imported-ghe-project-names-links-to-github' into 'master'	Robert Speicher	2016-04-19	2	-2/+20
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GitHub project's link in the import page when provider has a custom URL Closes gitlab-org/gitlab-ee#478 See merge request !3803
\| * \|	Fix GitHub project's link on import page when provider has a custom URL	Douglas Barbosa Alexandre	2016-04-19	2	-2/+20
\| \| \|
* \| \|	Merge branch 'pmq20/gitlab-ce-issue_12785'	Douwe Maan	2016-04-19	13	-79/+180
\|\ \ \
\| * \| \|	Add support to cherry-pick any commit	P.S.V.R	2016-04-18	13	-79/+180
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
* \| \| \|	Merge branch 'mr-formatting' into 'master'	Robert Speicher	2016-04-19	17	-19/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740
\| * \| \| \|	format merge request references properly	Ben Bodenmiller	2016-04-18	17	-19/+19
\| \| \| \| \|
* \| \| \| \|	Merge branch '14566-confidential-issue-branches' into 'master'	Robert Speicher	2016-04-19	2	-8/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize branch names for confidential issues - When creating new branches for confidential issues, prefer a branch name like `issue-15` to `some-sensitive-issue-title-15`. - The behaviour for non-confidential issues stays the same. Closes #14566 See merge request !3671
\| * \| \| \| \|	A new branch created for a confidential issue is named ↵14566-confidential-issue-branches	Timothy Andrew	2016-04-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`<id>-confidential-issue`.
\| * \| \| \| \|	Remove unused variable in `IssuesController`.	Timothy Andrew	2016-04-18	1	-2/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Timothy Andrew	2016-04-15	85	-291/+695
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	14566-confidential-issue-branches
\| * \ \ \ \ \	Merge remote-tracking branch 'origin/master' into ↵	Timothy Andrew	2016-04-13	58	-360/+533
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	14566-confidential-issue-branches
\| * \| \| \| \| \| \|	Refactor `Issue#related_branches`	Timothy Andrew	2016-04-12	2	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Previously, the controller held the logic to calculate related branches, which was: `<branches ending with `issue.iid`> - <branches with a merge request referenced in the current issue>` - This logic belongs in the `related_branches` method, not in the controller. This commit makes this change. - This means that `Issue#related_branches` now needs to take a `User`. When we find the branches that have a merge request referenced in the current issue, this is limited to merge requests that the current user has access to. - This is not directly related to #14566, but is a related refactoring.
\| * \| \| \| \| \| \|	Sanitize branch names for confidential issues.	Timothy Andrew	2016-04-12	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- When creating new branches for confidential issues, prefer a branch name like `issue-15` to `some-sensitive-issue-title-15`. - The behaviour for non-confidential issues stays the same.
* \| \| \| \| \| \| \|	Merge branch 'toggle-points-per-packet' into 'master'	Rémy Coutable	2016-04-19	2	-2/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Configuring of points per UDP packet Related to https://gitlab.com/gitlab-com/operations/issues/195. This option would allow us to experiment with finding a good balance between points-per-packet and the UDP packet size. cc @pcarranza See merge request !3816
\| * \| \| \| \| \| \| \|	Configuring of points per UDP packettoggle-points-per-packet	Yorick Peterse	2016-04-19	2	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows users to configure the number of points stored in a single UDP packet. This in turn can be used to reduce the number of UDP packets being sent at the cost of these packets being somewhat larger. The default setting is 1 point per packet so nothing changes for existing users.
* \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-15126' into 'master'	Douwe Maan	2016-04-19	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove persistent XSS vulnerability in `commit_person_link` helper Because we were incorrectly supplying the tooltip title as `data-original-title` (which Bootstrap's Tooltip JS automatically applies based on the `title` attribute; we should never be setting it directly), the value was being passed through as-is. Instead, we should be supplying the normal `title` attribute and letting Rails escape the value, which also negates the need for us to call `sanitize` on it. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126 See merge request !1948
\| * \| \| \| \| \| \| \| \|	Remove additional misuse of `data-original-title` attribute	Robert Speicher	2016-04-18	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove persistent XSS vulnerability in `commit_person_link` helper	Robert Speicher	2016-04-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because we were incorrectly supplying the tooltip title as `data-original-title` (which Bootstrap's Tooltip JS automatically applies based on the `title` attribute; we should never be setting it directly), the value was being passed through as-is. Instead, we should be supplying the normal `title` attribute and letting Rails escape the value, which also negates the need for us to call `sanitize` on it. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126
* \| \| \| \| \| \| \| \| \|	Merge branch 'profile-aside-toggle' into 'master'	Jacob Schatz	2016-04-19	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed aside toggle on profile pages Closes #13943 See merge request !3796
\| * \| \| \| \| \| \| \| \|	Removed aside toggle on profile pagesprofile-aside-toggle	Phil Hughes	2016-04-18	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13943
* \| \| \| \| \| \| \| \| \|	Merge branch 'dropdown-filter-after-load' into 'master'	Jacob Schatz	2016-04-19	2	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Trigger filtering after ajax is complete in dropdown ![filter](/uploads/1c361d968769eb3fe5cdd05dee497aa6/filter.gif) Closes #15186 See merge request !3813
\| * \| \| \| \| \| \| \| \|	Trigger filtering after ajax is complete in dropdowndropdown-filter-after-load	Phil Hughes	2016-04-19	2	-0/+4
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15186
* \| \| \| \| \| \| \| \|	Merge branch 'configurable-shared-runners-text' into 'master'	Kamil Trzciński	2016-04-19	4	-3/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add configurable shared runners text cc @axil @rspeicher @grzesiek See merge request !3750
\| * \| \| \| \| \| \| \| \|	Use different markdownconfigurable-shared-runners-text	Kamil Trzcinski	2016-04-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add configurable shared runners text	Kamil Trzcinski	2016-04-18	4	-3/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/link-group-permissions' into 'master'	Douwe Maan	2016-04-19	1	-4/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check permissions when sharing project with group ## Summary Unprivileged user was able to share project with group he didn't have access to, and therefore gain partial access to that group, which opened possibilities for further actions like listing private projects in that group. See https://gitlab.com/gitlab-org/gitlab-ce/issues/15330 ## Fix This change introduces additional check for group read access. ## Further work We can think about preventing such problems in the future (this is quite common problem) by moving permissions checks to another layer of abstraction (TBD). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15330 See merge request !1949
\| * \| \| \| \| \| \| \| \| \|	Use guard clause to check ability to share project	Grzegorz Bizon	2016-04-19	1	-7/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Refactor method that shares project with a group	Grzegorz Bizon	2016-04-19	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Check permissions when sharing project with group	Grzegorz Bizon	2016-04-19	1	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15330
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dz/system-hooks-ui' into 'master'	Dmitriy Zaporozhets	2016-04-19	3	-13/+36
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow enable/disable push events for system hooks in UI Improvement for !3744 Fixes #15284 See merge request !3812
\| * \| \| \| \| \| \| \| \| \|	Add push events to permit params in system hooksdz/system-hooks-ui	Dmitriy Zaporozhets	2016-04-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Allow enable/disable push events for system hooks	Dmitriy Zaporozhets	2016-04-19	2	-12/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/system_hook_push' into 'master'	Dmitriy Zaporozhets	2016-04-19	8	-31/+49
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added System Hooks for push and tag_push Implements `push` and `tag_push` events for System Hooks. They are based on Webhooks Events but without any deprecated item. We don't send commits too. We are implementing this, to be used by Geo repository syncing (gitlab-org/gitlab-ee#76). These hook events will be sent only when the respective configuration flags are set to true. UI changes to admin screen will be made in another MR. See merge request !3744
\| * \| \| \| \| \| \| \| \| \|	moving overlapping scopes to webhook	Gabriel Mazetto	2016-04-19	3	-5/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Using single builder for push and tag events	Gabriel Mazetto	2016-04-19	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Refactor GitTagPushService and fig tags_push system event hook	Gabriel Mazetto	2016-04-19	2	-16/+15
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Added System Hooks for push and tag_push	Gabriel Mazetto	2016-04-19	5	-15/+36
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Code is based on Project Webhooks, removing deprecations and without commits listing.
* \| \| \| \| \| \| \| \| \|	Merge branch 'auto-fsck-skip-wiki' into 'master'	Yorick Peterse	2016-04-19	4	-4/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve 'auto fsck' feature - skip wiki repositories when they are disabled (avoids false alarms) - more context in admin alert emails Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15332 See merge request !3781
\| * \| \| \| \| \| \| \| \|	Improve 'auto fsck' admin emails	Jacob Vosmaer	2016-04-18	3	-1/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	When a project wiki is disabled skip it for fsck	Jacob Vosmaer	2016-04-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'gh-keep-issues-prs-references' into 'master'	Robert Speicher	2016-04-18	1	-4/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use GitHub Issue/PR number as iid to keep references Closes #15294 See merge request !3759
\| * \| \| \| \| \| \| \| \| \|	Use GitHub Issue/PR number as iid to keep references	Douglas Barbosa Alexandre	2016-04-18	1	-4/+6
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With these changes we don’t lost the issue/pr references when importing them to GitLab.
* \| \| \| \| \| \| \| \| \|	Merge branch 'dropdown-filter-select' into 'master'	Jacob Schatz	2016-04-18	1	-8/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with multi select not working with arrow keys See merge request !3792