From dc15abaa221615ae57ec27cd30645879c63af1c1 Mon Sep 17 00:00:00 2001 From: mhasbini Date: Thu, 30 Mar 2017 15:38:48 +0300 Subject: Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery --- app/models/user.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/models') diff --git a/app/models/user.rb b/app/models/user.rb index cbd741f96ed..95a766f2ede 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -635,8 +635,10 @@ class User < ActiveRecord::Base end def fork_of(project) - links = ForkedProjectLink.where(forked_from_project_id: project, forked_to_project_id: personal_projects) - + links = ForkedProjectLink.where( + forked_from_project_id: project, + forked_to_project_id: personal_projects.unscope(:order) + ) if links.any? links.first.forked_to_project else -- cgit v1.2.1 From 653d5f4901f610876449a11fb7782362f826d15a Mon Sep 17 00:00:00 2001 From: Jarka Kadlecova Date: Fri, 31 Mar 2017 08:08:36 +0200 Subject: Fix link to Jira service documentation --- app/models/project_services/jira_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index eef403dba92..3b90fd1c2c7 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -62,7 +62,7 @@ class JiraService < IssueTrackerService def help "You need to configure JIRA before enabling this service. For more details read the - [JIRA service documentation](#{help_page_url('project_services/jira')})." + [JIRA service documentation](#{help_page_url('user/project/integrations/jira')})." end def title -- cgit v1.2.1