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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into james11/gitlab-ce-removable-group-owner	Douwe Maan	2015-11-17	249	-1130/+2235
\|\
\| *	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	1	-0/+10
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3026
\| * \| \|	Merge branch 'http-to-https' into 'master'	Achilleas Pipinellis	2015-11-17	2	-4/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-4/+4
\| \| \| \| \|
\| * \| \| \|	Merge branch 'global-milestones' into 'master'	Dmitriy Zaporozhets	2015-11-16	24	-186/+230
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| \| * \| \|	Few changes to Group Milestone feature:	Dmitriy Zaporozhets	2015-11-16	3	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Group attachments are not supported so I removed attach file link * Added changelog item * Add markdown hint to project milestone form Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Add header and page title to new milestone page	Dmitriy Zaporozhets	2015-11-16	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Lets add more tests to Milestones services	Dmitriy Zaporozhets	2015-11-16	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Move global milestone specs	Dmitriy Zaporozhets	2015-11-16	1	-26/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Fix a bug when milestone/label filter was empty for dashboard issues page	Dmitriy Zaporozhets	2015-11-16	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Refactor global and group milestones logic	Dmitriy Zaporozhets	2015-11-16	19	-165/+145
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Create milestones in the group	Dmitriy Zaporozhets	2015-11-16	3	-8/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Merge branch 'ci-runners-master-or-owner' into 'master'	Dmitriy Zaporozhets	2015-11-16	1	-5/+10
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show specific runners from projects where user is master or owner This fix for permission escalation when handling specific runners. The users were allowed to assign runners from projects where they were guests. See merge request !1809
\| \| * \| \|	Show specific runners from projects where user is master or ownerci-runners-master-or-owner	Kamil Trzcinski	2015-11-16	1	-5/+10
\| \| \| \| \|
\| * \| \| \|	Merge branch 'refactor-duplication' into 'master'	Dmitriy Zaporozhets	2015-11-16	6	-92/+45
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove some code duplication * remove duplicate code in uploaders * remove duplicate code in NotificationHelper * remove duplicate code in Repository Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1800
\| \| * \| \| \|	Fix wrong variable namerefactor-duplication	Dmitriy Zaporozhets	2015-11-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Remove duplicate code in Repository#*_names_contains	Dmitriy Zaporozhets	2015-11-16	1	-16/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Fix code duplication in NotificationsHelper	Dmitriy Zaporozhets	2015-11-16	1	-25/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Remove duplicate methods in uploaders	Dmitriy Zaporozhets	2015-11-16	4	-51/+25
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Add support for git lfs.lfs	Marin Jankovski	2015-11-16	5	-3/+59
\| \|/ / /
\| * \| \|	Merge branch 'fix_trailing_title_space' of ↵	Dmitriy Zaporozhets	2015-11-16	2	-2/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/dblessing/gitlab-ce
\| \| * \| \|	Fix trailing space issue with merge requests and issues. Fixes #2514	Drew Blessing	2015-11-10	2	-2/+6
\| \| \| \| \|
\| * \| \| \|	Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"rs-revert-gh-9812	Robert Speicher	2015-11-15	1	-27/+19
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 84999611d8f7894219eb4ebc76555c79b1f14794, reversing changes made to 0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b.
\| * \| \|	Merge branch 'impersonate' into 'master'	Dmitriy Zaporozhets	2015-11-14	6	-7/+47
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactor login as to be impersonation with better login/logout Modifies the existing "login as" feature to be called impersonation. This also adds: * Application keep track of who is impersonating the user so they can revert back to the original user without having to log out. * Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop. ## Screenshots: ![](http://sindacio.us/i/2015-10-28_17-52-41.png) ![](http://sindacio.us/i/2015-10-28_17-53-08.png) See merge request !1702
\| \| * \| \|	refactor login as to be impersonation with better login/logout	James Newton	2015-10-29	6	-7/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modifies the existing "login as" feature to be called impersonation, as well as keeping track of who is impersonating to revert back to that user without having to log out.
\| * \| \| \|	Merge branch 'annotate-models' into 'master'	Dmitriy Zaporozhets	2015-11-14	28	-77/+177
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Annotate models Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1799
\| \| * \| \| \|	Annotate models	Dmitriy Zaporozhets	2015-11-13	28	-77/+177
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Merge branch 'builds_feature' into 'master'	Kamil Trzciński	2015-11-13	10	-38/+35
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose builds feature Expose builds feature in project settings (as feature). Enable it by default for a new projects. I deliberately named it builds instead of CI, because we actualy allow to run tests using infrastructure built-in GitLab. I'm free to change it. ![Screen_Shot_2015-11-09_at_16.42.21](/uploads/a8af0a56fc0498688c0428ff22252d9c/Screen_Shot_2015-11-09_at_16.42.21.png) If we are ok, I'll add feature tests for it. /cc @sytses @dzaporozhets See merge request !1767
\| \| * \| \| \|	Fix broken tests	Kamil Trzcinski	2015-11-13	1	-24/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Expose CI enable option in project features	Kamil Trzcinski	2015-11-13	9	-14/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Enable CI by default for all new projects
\| * \| \| \| \|	Merge branch 'refactor-complex-methods' into 'master'	Dmitriy Zaporozhets	2015-11-13	4	-76/+98
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor complex methods Make flog part of CI check which is not allowed to fail. I used high score (70) and refactored most complex method. In future releases we should lower acceptable score to something like 40..50 Part of #3444 See merge request !1794
\| \| * \| \| \|	Split complex method EventsHelper#event_feed_url.	Dmitriy Zaporozhets	2015-11-13	1	-11/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Split complex method Issues::UpdateService#execute	Dmitriy Zaporozhets	2015-11-13	1	-13/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Split complex method SystemHooksService#build_event_data	Dmitriy Zaporozhets	2015-11-13	1	-30/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Split huge method MergeRequests::UpdateService#execute	Dmitriy Zaporozhets	2015-11-13	1	-22/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Merge pull request #9825 from huacnlee/cache-application-setting	Dmitriy Zaporozhets	2015-11-13	2	-3/+15
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add caching for ApplicationSetting, Ci::ApplicationSetting.
\| \| * \| \| \| \|	Add caching for ApplicationSetting, Ci::ApplicationSetting.	Jason Lee	2015-11-12	2	-3/+15
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ApplicationSetting.current was called in every pages, cache it and expires it after it updated. This changes will avoid a SQL query in every pages (~0.3 - 0.5ms). ```SQL SELECT "application_settings".* FROM "application_settings" ORDER BY "application_settings"."id" DESC LIMIT 1 ```
\| * \| \| \| \|	Add ignore white space option in merge request diff	Minsik Yoon	2015-11-13	5	-6/+21
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
\| * \| \| \|	Merge branch 'use-path-for-new-issue-button' into 'master'	Dmitriy Zaporozhets	2015-11-12	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a relative link instead of full URL with New Issue button to be consistent Relates to #3095 See merge request !1631
\| \| * \| \| \|	Use a relative link instead of full URL with New Issue button to be consistent	Stan Hu	2015-10-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relates to #3095
\| * \| \| \| \|	Merge branch 'fix-avatar-not-showing' of https://gitlab.com/stanhu/gitlab-ce	Dmitriy Zaporozhets	2015-11-12	4	-4/+4
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Fix avatars not showing in Atom feeds and project issues when Gravatar disabled	Stan Hu	2015-11-10	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for https://github.com/gitlabhq/gitlabhq/pull/9783
\| * \| \| \| \| \|	Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list	Dmitriy Zaporozhets	2015-11-12	5	-13/+16
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid render edit_form in each notes.
\| \| * \| \| \| \| \|	Avoid render edit_form in each notes.	Jason Lee	2015-11-12	5	-13/+16
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use RJS to render edit note feature. Before: ``` Rendered projects/notes/_note.html.haml (27.9ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.7ms) Rendered projects/_md_preview.html.haml (3.9ms) Rendered projects/notes/_edit_form.html.haml (6.9ms) Rendered projects/notes/_note.html.haml (17.7ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.6ms) Rendered projects/_md_preview.html.haml (3.4ms) Rendered projects/notes/_edit_form.html.haml (7.0ms) ``` After: ``` Rendered projects/notes/_note.html.haml (13.8ms) Rendered projects/notes/_note.html.haml (7.1ms) Rendered projects/notes/_note.html.haml (9.5ms) Rendered projects/notes/_note.html.haml (8.5ms) ``` This change reduce at least 6ms * N ('N' - number of notes).