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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Backport select_helper from EEbackport_changes_from_ee	Valery Sizov	2016-04-20	2	-15/+12
\|
*	Merge branch 'pmq20/gitlab-ce-issue_12785'	Douwe Maan	2016-04-19	26	-80/+390
\|\
\| *	Add support to cherry-pick any commit	P.S.V.R	2016-04-18	26	-80/+390
\| \| \| \| \| \| \| \| \| \|	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	24	-36/+37
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	24	-36/+37
\| \| \|
* \| \|	Merge branch '14566-confidential-issue-branches' into 'master'	Robert Speicher	2016-04-19	4	-15/+50
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`<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	177	-636/+3115
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	14566-confidential-issue-branches
\| * \| \| \|	Make a few style changes based on MR feedback.	Timothy Andrew	2016-04-15	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Timothy Andrew	2016-04-13	96	-479/+3791
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	14566-confidential-issue-branches
\| * \| \| \| \|	Update CHANGELOG	Timothy Andrew	2016-04-13	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix the rubocop check.	Timothy Andrew	2016-04-13	1	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Test the `Issue#to_branch_name` method.	Timothy Andrew	2016-04-12	1	-2/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Augment the tests for `Issue#related_branches`	Timothy Andrew	2016-04-12	1	-3/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Test the case where we have a referenced merge request that's being - excluded as a "related branch" - This took a while to figure out, especially the `create_cross_references!` line.
\| * \| \| \| \|	Refactor `Issue#related_branches`	Timothy Andrew	2016-04-12	3	-5/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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	6	-24/+40
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-24/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'bump-version' into 'master'	Yorick Peterse	2016-04-19	2	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump version to 8.8.0-pre See merge request !3809
\| * \| \| \| \| \| \|	Bump version to 8.8.0-prebump-version	Dmitriy Zaporozhets	2016-04-19	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2016-04-19	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'patch-1' into 'master'	Hannes Rosenögger	2016-04-19	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"git lfs init" is deprecated, use "git lfs install" instead. Recent releases of git-lfs warn that "init" is a deprecated command and that "install" should be used. See merge request !3779
\| \| * \| \| \| \| \| \| \|	"git lfs init" is deprecated, use "git lfs install" instead.	Con Vissenberg	2016-04-18	1	-1/+1
\| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-15126' into 'master'	Douwe Maan	2016-04-19	6	-5/+35
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove persistent XSS vulnerability in `commit_person_link` helper	Robert Speicher	2016-04-17	3	-2/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'api-fix-annotated-tags' into 'master'	Rémy Coutable	2016-04-19	3	-1/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Present an array of Gitlab::Git::Tag instead of array of rugged tags The annotated message was always `null` because the wrong array was presented. The entity requires an array of `Gitlab::Git::Tags` instead an array of raw rugged tags was presented. Since a rugged tag does not respond to `message` to get the annotated message, this was always `null`. See merge request !3764
\| * \| \| \| \| \| \| \| \|	Ensure that annoation is presented properly	Robert Schilling	2016-04-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	API: Present an array of Gitlab::Git::Tag instead of array of rugged tags	Robert Schilling	2016-04-17	2	-1/+2
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs/notice-about-gitlab-runner' into 'master'	Grzegorz Bizon	2016-04-19	2	-1/+25
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add notice about GitLab Runner to requirements docs This is related to #14589, and problems that may stem from running GitLab Runner on same machine user installed GitLab web app on. See merge request !3518
\| * \| \| \| \| \| \| \| \|	Add a note about installing Runners in ci/runners/README.mddocs/notice-about-gitlab-runner	Achilleas Pipinellis	2016-04-11	1	-1/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add link to Runner security doc	Achilleas Pipinellis	2016-04-11	1	-4/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Add notice about GitLab Runner to requirements docs	Grzegorz Bizon	2016-04-04	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is related to !14589, and problems that may stem from running GitLab Runner on same machine user installed GitLab web app on.
* \| \| \| \| \| \| \| \| \|	Merge branch 'configurable-shared-runners-text' into 'master'	Kamil Trzciński	2016-04-19	8	-4/+39
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add configurable shared runners text cc @axil @rspeicher @grzesiek See merge request !3750
\| * \| \| \| \| \| \| \| \| \|	Use different markdownconfigurable-shared-runners-text	Kamil Trzcinski	2016-04-19	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix CHANGELOG	Kamil Trzcinski	2016-04-18	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update according to review comments	Kamil Trzcinski	2016-04-18	2	-6/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add configurable shared runners text	Kamil Trzcinski	2016-04-18	8	-4/+40
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Grzegorz Bizon	2016-04-19	3	-4/+59
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of dev.gitlab.org:gitlab/gitlabhq: Add Changelog entry for group link permissions fix Use guard clause to check ability to share project Refactor method that shares project with a group Check permissions when sharing project with group
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'fix/link-group-permissions' into 'master'	Douwe Maan	2016-04-19	3	-4/+59
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \| \| \| \|	Add Changelog entry for group link permissions fix	Grzegorz Bizon	2016-04-19	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	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	2	-4/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15330
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'make-before-after-overridable' into 'master'	Kamil Trzciński	2016-04-19	4	-18/+109
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make before_script and after_script overridable This is makes it possible to overwrite the before_script and after_script at job level. This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3771 See merge request !3772