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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update CHANGELOG [ci skip]	Mehmet Beydogan	2016-04-20	1	-0/+4
\|
*	Add due_date:time field to Issue model	Mehmet Beydogan	2016-04-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|	Add due_date text field to sidebar issue#show Add ability sorting issues by due date ASC and DESC Add ability to filtering issues by No Due Date, Any Due Date, Due to tomorrow, Due in this week options Add handling issue due_date field for MergeRequest Update CHANGELOG Fix ambigous match for issues#show sidebar Fix SCREAMING_SNAKE_CASE offenses for due date contants Add specs for due date sorting and filtering on issues
*	update CHANGELOG	Annabel Dunstone	2016-04-20	1	-2/+0
\|
*	Add diff scroll to changelog	Annabel Dunstone	2016-04-20	1	-0/+1
\|
*	Update changelog	Annabel Dunstone	2016-04-20	1	-0/+5
\|
*	Update CHANGELOG	Tomasz Maczukin	2016-04-20	1	-0/+1
\| \| \| \|	[ci skip]
*	Merge branch 'slack_wiki_notifications' into 'master'	Rémy Coutable	2016-04-20	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add slack notifications for wiki pages ## What does this MR do? Lets the Slack service be configured to send notifications when wiki pages are created or edited. ## Are there points in the code the reviewer needs to double check? I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :) ## Why was this MR needed? Related to #563 and fixes #4233. See merge request !2998
\| *	Update changelog	Sebastian Klier	2016-04-20	1	-1/+1
\| \|
\| *	update changelog	Sebastian Klier	2016-04-20	1	-1/+1
\| \|
\| *	add slack notifications for wiki pages	Sebastian Klier	2016-04-20	1	-0/+1
\| \| \| \| \| \| \| \|	update changelog
* \|	Merge branch 'feature/raw-trace-output' into 'master'	Rémy Coutable	2016-04-20	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add raw build trace output Closes #15308, #15147 Changes in the UI: - on finished build: ![raw-on-finished-build](/uploads/0e0904940db5b381ae064d49343c6508/raw-on-finished-build.png) - on running build: ![raw-on-running-build](/uploads/0e4c800b68c12bdd0cbd2eea732b22ff/raw-on-running-build.png) See merge request !3767
\| * \|	Update CHANGELOG	Tomasz Maczukin	2016-04-19	1	-0/+1
\| \| \|
* \| \|	Merge branch 'license-templates-and-api-12804' into 'master'	Robert Speicher	2016-04-20	1	-0/+2
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
\| * \|	Continue implementation of the license template selector and /licenses API ↵	Rémy Coutable	2016-04-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	endpoint Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Update CHANGELOG	Robert Speicher	2016-04-19	1	-1/+3
\| \|/ \|/\| \| \| \| \|	[ci skip]
* \|	Merge branch 'imported-ghe-project-names-links-to-github' into 'master'	Robert Speicher	2016-04-19	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+1
\| \| \|
* \| \|	Merge branch 'pmq20/gitlab-ce-issue_12785'	Douwe Maan	2016-04-19	1	-0/+1
\|\ \ \
\| * \| \|	Add support to cherry-pick any commit	P.S.V.R	2016-04-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch '14566-confidential-issue-branches' into 'master'	Robert Speicher	2016-04-19	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \ \ \	Merge remote-tracking branch 'origin/master' into ↵	Timothy Andrew	2016-04-15	1	-1/+26
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	14566-confidential-issue-branches
\| * \ \ \ \ \	Merge remote-tracking branch 'origin/master' into ↵	Timothy Andrew	2016-04-13	1	-0/+13
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	14566-confidential-issue-branches
\| * \| \| \| \| \| \|	Update CHANGELOG	Timothy Andrew	2016-04-13	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'toggle-points-per-packet' into 'master'	Rémy Coutable	2016-04-19	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+1
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump version to 8.8.0-pre See merge request !3809
\| * \| \| \| \| \| \|	Bump version to 8.8.0-prebump-version	Dmitriy Zaporozhets	2016-04-19	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'api-fix-annotated-tags' into 'master'	Rémy Coutable	2016-04-19	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	API: Present an array of Gitlab::Git::Tag instead of array of rugged tags	Robert Schilling	2016-04-17	1	-0/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'configurable-shared-runners-text' into 'master'	Kamil Trzciński	2016-04-19	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add configurable shared runners text cc @axil @rspeicher @grzesiek See merge request !3750
\| * \| \| \| \| \| \| \|	Fix CHANGELOG	Kamil Trzcinski	2016-04-18	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update according to review comments	Kamil Trzcinski	2016-04-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add configurable shared runners text	Kamil Trzcinski	2016-04-18	1	-0/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Grzegorz Bizon	2016-04-19	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '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	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'make-before-after-overridable' into 'master'	Kamil Trzciński	2016-04-19	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'after-script' into make-before-after-overridable	Kamil Trzcinski	2016-04-18	1	-1/+12
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG and add documentation	Kamil Trzcinski	2016-04-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'after-script' into 'master'	Kamil Trzciński	2016-04-19	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| / / / / / / / / / / \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement after_script which allows to do cleanups as part of the build process This implements `after_script` in global context. The `after_script` will be executed always after the job, even if the job were canceled. This requires changes on Runner side that will be implemented in 1.2. cc @tmaczukin @grzesiek See merge request !3771
\| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into after-script	Kamil Trzcinski	2016-04-18	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into after-script	Kamil Trzcinski	2016-04-18	1	-1/+10
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add CHANGELOG and documentation	Kamil Trzcinski	2016-04-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Allow enable/disable push events for system hooks	Dmitriy Zaporozhets	2016-04-19	1	-0/+1
\| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Add CHANGELOG itemfeature/system_hook_push	Dmitriy Zaporozhets	2016-04-19	1	-0/+2
\| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \|	Update CHANGELOG	Douglas Barbosa Alexandre	2016-04-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Update CHANGELOG	Douglas Barbosa Alexandre	2016-04-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'gh-keep-issues-prs-references' into 'master'	Robert Speicher	2016-04-18	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use GitHub Issue/PR number as iid to keep references Closes #15294 See merge request !3759