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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master'	Robert Speicher	2015-11-17	14	-77/+149
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent the last owner of a group from being able to delete themselves by 'adding' themselves as a master Replaces !1708. Fixes #1111. See merge request !1815
\| *	Add changelog itemjames11/gitlab-ce-removable-group-owner	Douwe Maan	2015-11-17	1	-0/+1
\| \|
\| *	Use project member abilities more extensively	Douwe Maan	2015-11-17	7	-45/+49
\| \|
\| *	Refactor ability changes	Douwe Maan	2015-11-17	5	-71/+67
\| \|
\| *	Merge branch 'master' into james11/gitlab-ce-removable-group-owner	Douwe Maan	2015-11-17	495	-2349/+8219
\| \|\
\| * \|	fixing rubocop - random code not related to the changes	James Lopez	2015-11-12	1	-5/+9
\| \| \|
\| * \|	fixing rubocop indents	James Lopez	2015-11-12	1	-1/+2
\| \| \|
\| * \|	fixing rubocop indents	James Lopez	2015-11-12	2	-12/+14
\| \| \|
\| * \|	updated exception	James Lopez	2015-11-11	1	-1/+1
\| \| \|
\| * \|	refactored code as projects only have one owner. Kept some refactoring in ↵	James Lopez	2015-11-11	4	-40/+35
\| \| \| \| \| \| \| \| \| \| \| \|	place (has_owners concern)
\| * \|	refactored permissions and added update_project_member ability logic. Also ↵	James Lopez	2015-11-03	5	-24/+57
\| \| \| \| \| \| \| \| \| \| \| \|	refactored owner methods to a concern.
\| * \|	fix issue with adding members to project (spotted by test)	James Lopez	2015-10-30	1	-2/+11
\| \| \|
\| * \|	fixed last group owner issue and added test	James Lopez	2015-10-29	3	-4/+31
\| \| \|
* \| \|	Merge branch 'remove-code-duplication'	Dmitriy Zaporozhets	2015-11-17	22	-434/+371
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Code duplication check should be enabled nowremove-code-duplication	Dmitriy Zaporozhets	2015-11-17	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Remove small code duplication in user_reference_filter.rb	Dmitriy Zaporozhets	2015-11-17	1	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Refactor similar code for Issue and MR update service	Dmitriy Zaporozhets	2015-11-17	3	-57/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Remove code duplication in notification_service.rb	Dmitriy Zaporozhets	2015-11-17	1	-28/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Remove duplication in mailers/emails/notes.rb	Dmitriy Zaporozhets	2015-11-17	2	-45/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Set higher flay value to avoid unnecessary refactoring for now	Dmitriy Zaporozhets	2015-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Refactor duplciate code for groups_controller.rb and ↵	Dmitriy Zaporozhets	2015-11-17	6	-50/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	slack_service/note_message.rb Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Remove duplication in diff_helper.rb	Dmitriy Zaporozhets	2015-11-17	1	-16/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Remove code duplication in gitlab_markdown_helper.rb	Dmitriy Zaporozhets	2015-11-17	1	-28/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Remove duplication in issue emails	Dmitriy Zaporozhets	2015-11-16	1	-36/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Allow flay to fail for now since there is still a lot of refactoring todo	Dmitriy Zaporozhets	2015-11-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Remove duplication in reference filters	Dmitriy Zaporozhets	2015-11-16	4	-166/+119
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Refactor select2 tags	Dmitriy Zaporozhets	2015-11-16	2	-11/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Dont allow code duplication check to fail	Dmitriy Zaporozhets	2015-11-16	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Bump VERSION	Robert Speicher	2015-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'param-view' into 'master'	Robert Speicher	2015-11-17	6	-9/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !1816
\| * \| \| \|	Don't use params[:view] directly.param-view	Douwe Maan	2015-11-17	6	-9/+12
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Update CHANGELOG	Robert Speicher	2015-11-17	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Update monthly release template	Robert Speicher	2015-11-17	1	-12/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge pull request #9833 from huacnlee/fix/pr-9820-missings	Robert Speicher	2015-11-17	1	-2/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Don't render note edit forms for visitors
\| * \| \| \|	Avoid render edit_form when visitor can't edit them.	Jason Lee	2015-11-17	1	-2/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Reverted #9820, github/task_list need a form, textarea for update.
* \| \| \|	Merge branch 'rs-revert-gh-9820' into 'master'	Robert Speicher	2015-11-17	9	-18/+24
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list" This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a. Reverts https://github.com/gitlabhq/gitlabhq/pull/9820 See merge request !1804
\| * \| \|	Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820	Robert Speicher	2015-11-16	9	-18/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-11-17	3	-1/+29
\|\ \ \ \
\| * \ \ \	Merge branch 'issue/vars-need-eval' into 'master'	Douwe Maan	2015-11-17	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure variable in mail is evalled I received this snippet in the mail: ``` Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Project #{@old_path_with_namespace} was moved to another location The project is now located under ``` This MR fixes it. Notes: * I did a quick grep on other 'text.erb' files, but this was the only one with this type of error * I made no changes to the specs. The only [spec](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/spec/mailers/notify_spec.rb#L412) I could find passes because (I assume) the correct value is in the html-part See merge request !1706
\| \| * \| \| \|	Ensure variable is evalled	Gert Goet	2015-10-29	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'rs-wiki-touches-project' into 'master'	Douwe Maan	2015-11-17	2	-0/+28
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make ProjectWiki touch Project#last_activity_at after wiki actions Closes #3026 See merge request !1803
\| \| * \| \| \| \|	Make ProjectWiki touch Project#last_activity_at after wiki actionsrs-wiki-touches-project	Robert Speicher	2015-11-16	2	-0/+28
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3026
* \| \| \| \| \|	Merge pull request #9837 from Great-Antique/master	Robert Schilling	2015-11-17	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fix md syntax in doc/api/commits.md
\| * \| \| \| \|	Fix md syntax in doc/api/commits.md	Den Girnyk	2015-11-17	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge branch 'http-to-https' into 'master'	Achilleas Pipinellis	2015-11-17	20	-45/+45
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rewrite HTTP links to force TLS, where possible I got annoyed at the fact that the links on the profile page don't force the use of TLS, so I grepped through the entire source tree, tested all the links I found, and replaced them if possible. See merge request !1806
\| * \| \| \|	Rewrite HTTP links to force TLS, where possible	Alex Jordan	2015-11-16	20	-45/+45
\| \| \| \| \|
* \| \| \| \|	Merge branch 'global-milestones' into 'master'	Dmitriy Zaporozhets	2015-11-16	37	-258/+398
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create milestones in the group When you work with groups its quite often you want to create same milestone in multiple projects. This MR allows you to do so For #3488 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1797
\| * \| \| \| \|	Some code and doc improvementsglobal-milestones	Dmitriy Zaporozhets	2015-11-16	4	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Fix removing avatar for group	Dmitriy Zaporozhets	2015-11-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Group masters should be able to create/close milestones	Dmitriy Zaporozhets	2015-11-16	5	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>