Context refactoring. Move Issues list, Search logic to context

randx
1 parent 63fe042d
Showing 17 changed files with 144 additions and 127 deletions Show diff stats
app/contexts/commit_load.rb
app/contexts/commit_load_context.rb
app/contexts/issues_list_context.rb
app/contexts/merge_requests_load.rb
app/contexts/merge_requests_load_context.rb
app/contexts/search_context.rb
app/controllers/commit_controller.rb
app/controllers/dashboard_controller.rb
app/controllers/groups_controller.rb
app/controllers/issues_controller.rb
app/controllers/merge_requests_controller.rb
app/controllers/milestones_controller.rb
app/controllers/refs_controller.rb
app/controllers/search_controller.rb
app/helpers/issues_helper.rb
app/models/event.rb
app/roles/issue_commonality.rb
@@ -1,33 +0,0 @@
-class CommitLoad < BaseContext
-  def execute
-    result = { 
-      commit: nil,
-      suppress_diff: false,
-      line_notes: [],
-      notes_count: 0,
-      note: nil, 
-      status: :ok
-    }
-
-    commit = project.commit(params[:id])
-
-    if commit 
-      commit = CommitDecorator.decorate(commit)
-      line_notes = project.commit_line_notes(commit)
-
-      result[:commit] = commit
-      result[:note] = project.build_commit_note(commit)
-      result[:line_notes] = line_notes
-      result[:notes_count] = line_notes.count + project.commit_notes(commit).count
-
-      begin
-        result[:suppress_diff] = true if commit.diffs.size > 200 && !params[:force_show_diff]
-      rescue Grit::Git::GitTimeout
-        result[:suppress_diff] = true
-        result[:status] = :huge_commit
-      end
-    end
-
-    result
-  end
-end
@@ -0,0 +1,33 @@
+class CommitLoadContext < BaseContext
+  def execute
+    result = {
+      commit: nil,
+      suppress_diff: false,
+      line_notes: [],
+      notes_count: 0,
+      note: nil,
+      status: :ok
+    }
+
+    commit = project.commit(params[:id])
+
+    if commit
+      commit = CommitDecorator.decorate(commit)
+      line_notes = project.commit_line_notes(commit)
+
+      result[:commit] = commit
+      result[:note] = project.build_commit_note(commit)
+      result[:line_notes] = line_notes
+      result[:notes_count] = line_notes.count + project.commit_notes(commit).count
+
+      begin
+        result[:suppress_diff] = true if commit.diffs.size > 200 && !params[:force_show_diff]
+      rescue Grit::Git::GitTimeout
+        result[:suppress_diff] = true
+        result[:status] = :huge_commit
+      end
+    end
+
+    result
+  end
+end
@@ -0,0 +1,29 @@
+class IssuesListContext < BaseContext
+  include IssuesHelper
+
+  attr_accessor :issues
+
+  def execute
+    @issues = case params[:f]
+              when issues_filter[:all] then @project.issues
+              when issues_filter[:closed] then @project.issues.closed
+              when issues_filter[:to_me] then @project.issues.opened.assigned(current_user)
+              else @project.issues.opened
+              end
+
+    @issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present?
+    @issues = @issues.includes(:author, :project).order("updated_at")
+
+    # Filter by specific assignee_id (or lack thereof)?
+    if params[:assignee_id].present?
+      @issues = @issues.where(assignee_id: (params[:assignee_id] == '0' ? nil : params[:assignee_id]))
+    end
+
+    # Filter by specific milestone_id (or lack thereof)?
+    if params[:milestone_id].present?
+      @issues = @issues.where(milestone_id: (params[:milestone_id] == '0' ? nil : params[:milestone_id]))
+    end
+
+    @issues
+  end
+end
@@ -1,16 +0,0 @@
-class MergeRequestsLoad < BaseContext
-  def execute
-    type = params[:f]
-
-    merge_requests = project.merge_requests
-
-    merge_requests = case type
-                     when 'all' then merge_requests
-                     when 'closed' then merge_requests.closed
-                     when 'assigned-to-me' then merge_requests.opened.assigned(current_user)
-                     else merge_requests.opened
-                     end.page(params[:page]).per(20)
-
-    merge_requests.includes(:author, :project).order("closed, created_at desc")
-  end
-end
@@ -0,0 +1,16 @@
+class MergeRequestsLoadContext < BaseContext
+  def execute
+    type = params[:f]
+
+    merge_requests = project.merge_requests
+
+    merge_requests = case type
+                     when 'all' then merge_requests
+                     when 'closed' then merge_requests.closed
+                     when 'assigned-to-me' then merge_requests.opened.assigned(current_user)
+                     else merge_requests.opened
+                     end.page(params[:page]).per(20)
+
+    merge_requests.includes(:author, :project).order("closed, created_at desc")
+  end
+end
@@ -0,0 +1,27 @@
+class SearchContext
+  attr_accessor :project_ids, :params
+
+  def initialize(project_ids, params)
+    @project_ids, @params = project_ids, params.dup
+  end
+
+  def execute
+    query = params[:search]
+
+    return result unless query.present?
+
+    result[:projects] = Project.where(id: project_ids).search(query).limit(10)
+    result[:merge_requests] = MergeRequest.where(project_id: project_ids).search(query).limit(10)
+    result[:issues] = Issue.where(project_id: project_ids).search(query).limit(10)
+    result
+  end
+
+  def result
+    @result ||= {
+      projects: [],
+      merge_requests: [],
+      issues: []
+    }
+  end
+end
+
@@ -8,7 +8,7 @@ class CommitController &lt; ProjectResourceController
   before_filter :require_non_empty_project
   def show
-    result = CommitLoad.new(project, current_user, params).execute
+    result = CommitLoadContext.new(project, current_user, params).execute
     @commit = result[:commit]
     git_not_found! unless @commit
@@ -6,7 +6,7 @@ class DashboardController &lt; ApplicationController
     @projects = current_user.projects_with_events
     @projects = @projects.page(params[:page]).per(20)
-    @events = Event.recent_for_user(current_user).limit(20).offset(params[:offset] || 0)
+    @events = Event.in_projects(current_user.project_ids).limit(20).offset(params[:offset] || 0)
     @last_push = current_user.recent_push
     respond_to do |format|
@@ -19,14 +19,14 @@ class DashboardController &lt; ApplicationController
   # Get authored or assigned open merge requests
   def merge_requests
     @projects = current_user.projects.all
-    @merge_requests = current_user.cared_merge_requests.order("created_at DESC").page(params[:page]).per(20)
+    @merge_requests = current_user.cared_merge_requests.recent.page(params[:page]).per(20)
   end
   # Get only assigned issues
   def issues
     @projects = current_user.projects.all
     @user   = current_user
-    @issues = current_user.assigned_issues.opened.order("created_at DESC").page(params[:page]).per(20)
+    @issues = current_user.assigned_issues.opened.recent.page(params[:page]).per(20)
     @issues = @issues.includes(:author, :project)
     respond_to do |format|
@@ -6,10 +6,7 @@ class GroupsController &lt; ApplicationController
   before_filter :projects
   def show
-    @events = Event.where(project_id: project_ids).
-      order('id DESC').
-      limit(20).offset(params[:offset] || 0)
-
+    @events = Event.in_projects(project_ids).limit(20).offset(params[:offset] || 0)
     @last_push = current_user.recent_push
     respond_to do |format|
@@ -22,14 +19,14 @@ class GroupsController &lt; ApplicationController
   # Get authored or assigned open merge requests
   def merge_requests
     @merge_requests = current_user.cared_merge_requests
-    @merge_requests = @merge_requests.of_group(@group).order("created_at DESC").page(params[:page]).per(20)
+    @merge_requests = @merge_requests.of_group(@group).recent.page(params[:page]).per(20)
   end
   # Get only assigned issues
   def issues
     @user   = current_user
     @issues = current_user.assigned_issues.opened
-    @issues = @issues.of_group(@group).order("created_at DESC").page(params[:page]).per(20)
+    @issues = @issues.of_group(@group).recent.page(params[:page]).per(20)
     @issues = @issues.includes(:author, :project)
     respond_to do |format|
@@ -39,16 +36,11 @@ class GroupsController &lt; ApplicationController
   end
   def search
-    query = params[:search]
-
-    @merge_requests = []
-    @issues = []
+    result = SearchContext.new(project_ids, params).execute
-    if query.present?
-      @projects = @projects.search(query).limit(10)
-      @merge_requests = MergeRequest.where(project_id: project_ids).search(query).limit(10)
-      @issues = Issue.where(project_id: project_ids).search(query).limit(10)
-    end
+    @projects       = result[:projects]
+    @merge_requests = result[:merge_requests]
+    @issues         = result[:issues]
   end
   def people
 class IssuesController < ProjectResourceController
   before_filter :module_enabled
   before_filter :issue, only: [:edit, :update, :destroy, :show]
-  helper_method :issues_filter
   # Allow read any issue
   before_filter :authorize_read_issue!
@@ -19,7 +18,6 @@ class IssuesController &lt; ProjectResourceController
   def index
     @issues = issues_filtered
-
     @issues = @issues.page(params[:page]).per(20)
     respond_to do |format|
@@ -54,7 +52,7 @@ class IssuesController &lt; ProjectResourceController
     respond_to do |format|
       format.html do
-        if @issue.valid? 
+        if @issue.valid?
           redirect_to project_issue_path(@project, @issue)
         else
           render :new
@@ -69,7 +67,7 @@ class IssuesController &lt; ProjectResourceController
     respond_to do |format|
       format.js
-      format.html do 
+      format.html do
         if @issue.valid?
           redirect_to [@project, @issue]
         else
@@ -134,35 +132,6 @@ class IssuesController &lt; ProjectResourceController
   end
   def issues_filtered
-    @issues = case params[:f]
-              when issues_filter[:all] then @project.issues
-              when issues_filter[:closed] then @project.issues.closed
-              when issues_filter[:to_me] then @project.issues.opened.assigned(current_user)
-              else @project.issues.opened
-              end
-
-    @issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present?
-    @issues = @issues.includes(:author, :project).order("updated_at")
-
-    # Filter by specific assignee_id (or lack thereof)?
-    if params[:assignee_id].present?
-      @issues = @issues.where(assignee_id: (params[:assignee_id] == '0' ? nil : params[:assignee_id]))
-    end
-
-    # Filter by specific milestone_id (or lack thereof)?
-    if params[:milestone_id].present?
-      @issues = @issues.where(milestone_id: (params[:milestone_id] == '0' ? nil : params[:milestone_id]))
-    end
-
-    @issues
-  end
-
-  def issues_filter
-    {
-      all: "all",
-      closed: "closed",
-      to_me: "assigned-to-me",
-      open: "open" 
-    }
+    @issues = IssuesListContext.new(project, current_user, params).execute
   end
 end
@@ -18,7 +18,7 @@ class MergeRequestsController &lt; ProjectResourceController
   def index
-    @merge_requests = MergeRequestsLoad.new(project, current_user, params).execute
+    @merge_requests = MergeRequestsLoadContext.new(project, current_user, params).execute
   end
   def show
@@ -55,7 +55,7 @@ class MergeRequestsController &lt; ProjectResourceController
       @merge_request.reload_code
       redirect_to [@project, @merge_request], notice: 'Merge request was successfully created.'
     else
-      render action: "new" 
+      render action: "new"
     end
   end
@@ -70,7 +70,7 @@ class MergeRequestsController &lt; ProjectResourceController
   end
   def automerge_check
-    if @merge_request.unchecked? 
+    if @merge_request.unchecked?
       @merge_request.check_if_can_be_merged
     end
     render json: {state: @merge_request.human_state}
@@ -125,7 +125,7 @@ class MergeRequestsController &lt; ProjectResourceController
   def validates_merge_request
     # Show git not found page if target branch doesnt exist
-    return git_not_found! unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch) 
+    return git_not_found! unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)
     # Show git not found page if source branch doesnt exist
     # and there is no saved commits between source & target branch
@@ -136,7 +136,7 @@ class MergeRequestsController &lt; ProjectResourceController
     # Build a note object for comment form
     @note = @project.notes.new(noteable: @merge_request)
-    # Get commits from repository 
+    # Get commits from repository
     # or from cache if already merged
     @commits = @merge_request.commits
     @commits = CommitDecorator.decorate(@commits)
@@ -54,7 +54,7 @@ class MilestonesController &lt; ProjectResourceController
     respond_to do |format|
       format.js
-      format.html do 
+      format.html do
         if @milestone.valid?
           redirect_to [@project, @milestone]
         else
@@ -9,9 +9,9 @@ class RefsController &lt; ProjectResourceController
   before_filter :ref
   before_filter :define_tree_vars, only: [:blob, :logs_tree]
-  def switch 
-    respond_to do |format| 
-      format.html do 
+  def switch
+    respond_to do |format|
+      format.html do
         new_path = if params[:destination] == "tree"
                      project_tree_path(@project, @ref)
                    else
 class SearchController < ApplicationController
   def show
-    query = params[:search]
+    result = SearchContext.new(current_user.project_ids, params).execute
-    @projects = []
-    @merge_requests = []
-    @issues = []
-
-    if query.present?
-      @projects = current_user.projects.search(query).limit(10)
-      @merge_requests = MergeRequest.where(project_id: current_user.project_ids).search(query).limit(10)
-      @issues = Issue.where(project_id: current_user.project_ids).search(query).limit(10)
-    end
+    @projects       = result[:projects]
+    @merge_requests = result[:merge_requests]
+    @issues         = result[:issues]
   end
 end
@@ -43,4 +43,13 @@ module IssuesHelper
     # Milestone uses :title, Issue uses :name
     OpenStruct.new(id: 0, title: 'Unspecified', name: 'Unassigned')
   end
+
+  def issues_filter
+    {
+      all: "all",
+      closed: "closed",
+      to_me: "assigned-to-me",
+      open: "open"
+    }
+  end
 end
@@ -30,6 +30,7 @@ class Event &lt; ActiveRecord::Base
   # Scopes
   scope :recent, order("created_at DESC")
   scope :code_push, where(action: Pushed)
+  scope :in_projects, ->(project_ids) { where(project_id: project_ids).recent }
   class << self
     def determine_action(record)
@@ -39,10 +40,6 @@ class Event &lt; ActiveRecord::Base
         Event::Commented
       end
     end
-
-    def recent_for_user user
-      where(project_id: user.projects.map(&:id)).recent
-    end
   end
   # Next events currently enabled for system
-# Contains common functionality
-# shared between Issues and MergeRequests
+# Contains common functionality shared between Issues and MergeRequests
 module IssueCommonality
   extend ActiveSupport::Concern
@@ -18,6 +17,7 @@ module IssueCommonality
     scope :closed, where(closed: true)
     scope :of_group, ->(group) { where(project_id: group.project_ids) }
     scope :assigned, ->(u) { where(assignee_id: u.id)}
+    scope :recent, order("created_at DESC")
     delegate :name,
              :email,
	@@ -1,33 +0,0 @@	@@ -1,33 +0,0 @@
1	-class CommitLoad < BaseContext
2	- def execute
3	- result = {
4	- commit: nil,
5	- suppress_diff: false,
6	- line_notes: [],
7	- notes_count: 0,
8	- note: nil,
9	- status: :ok
10	- }
11	-
12	- commit = project.commit(params[:id])
13	-
14	- if commit
15	- commit = CommitDecorator.decorate(commit)
16	- line_notes = project.commit_line_notes(commit)
17	-
18	- result[:commit] = commit
19	- result[:note] = project.build_commit_note(commit)
20	- result[:line_notes] = line_notes
21	- result[:notes_count] = line_notes.count + project.commit_notes(commit).count
22	-
23	- begin
24	- result[:suppress_diff] = true if commit.diffs.size > 200 && !params[:force_show_diff]
25	- rescue Grit::Git::GitTimeout
26	- result[:suppress_diff] = true
27	- result[:status] = :huge_commit
28	- end
29	- end
30	-
31	- result
32	- end
33	-end
@@ -0,0 +1,33 @@		@@ -0,0 +1,33 @@
	1	+class CommitLoadContext < BaseContext
	2	+ def execute
	3	+ result = {
	4	+ commit: nil,
	5	+ suppress_diff: false,
	6	+ line_notes: [],
	7	+ notes_count: 0,
	8	+ note: nil,
	9	+ status: :ok
	10	+ }
	11	+
	12	+ commit = project.commit(params[:id])
	13	+
	14	+ if commit
	15	+ commit = CommitDecorator.decorate(commit)
	16	+ line_notes = project.commit_line_notes(commit)
	17	+
	18	+ result[:commit] = commit
	19	+ result[:note] = project.build_commit_note(commit)
	20	+ result[:line_notes] = line_notes
	21	+ result[:notes_count] = line_notes.count + project.commit_notes(commit).count
	22	+
	23	+ begin
	24	+ result[:suppress_diff] = true if commit.diffs.size > 200 && !params[:force_show_diff]
	25	+ rescue Grit::Git::GitTimeout
	26	+ result[:suppress_diff] = true
	27	+ result[:status] = :huge_commit
	28	+ end
	29	+ end
	30	+
	31	+ result
	32	+ end
	33	+end
@@ -0,0 +1,29 @@		@@ -0,0 +1,29 @@
	1	+class IssuesListContext < BaseContext
	2	+ include IssuesHelper
	3	+
	4	+ attr_accessor :issues
	5	+
	6	+ def execute
	7	+ @issues = case params[:f]
	8	+ when issues_filter[:all] then @project.issues
	9	+ when issues_filter[:closed] then @project.issues.closed
	10	+ when issues_filter[:to_me] then @project.issues.opened.assigned(current_user)
	11	+ else @project.issues.opened
	12	+ end
	13	+
	14	+ @issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present?
	15	+ @issues = @issues.includes(:author, :project).order("updated_at")
	16	+
	17	+ # Filter by specific assignee_id (or lack thereof)?
	18	+ if params[:assignee_id].present?
	19	+ @issues = @issues.where(assignee_id: (params[:assignee_id] == '0' ? nil : params[:assignee_id]))
	20	+ end
	21	+
	22	+ # Filter by specific milestone_id (or lack thereof)?
	23	+ if params[:milestone_id].present?
	24	+ @issues = @issues.where(milestone_id: (params[:milestone_id] == '0' ? nil : params[:milestone_id]))
	25	+ end
	26	+
	27	+ @issues
	28	+ end
	29	+end
	@@ -1,16 +0,0 @@	@@ -1,16 +0,0 @@
1	-class MergeRequestsLoad < BaseContext
2	- def execute
3	- type = params[:f]
4	-
5	- merge_requests = project.merge_requests
6	-
7	- merge_requests = case type
8	- when 'all' then merge_requests
9	- when 'closed' then merge_requests.closed
10	- when 'assigned-to-me' then merge_requests.opened.assigned(current_user)
11	- else merge_requests.opened
12	- end.page(params[:page]).per(20)
13	-
14	- merge_requests.includes(:author, :project).order("closed, created_at desc")
15	- end
16	-end
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+class MergeRequestsLoadContext < BaseContext
	2	+ def execute
	3	+ type = params[:f]
	4	+
	5	+ merge_requests = project.merge_requests
	6	+
	7	+ merge_requests = case type
	8	+ when 'all' then merge_requests
	9	+ when 'closed' then merge_requests.closed
	10	+ when 'assigned-to-me' then merge_requests.opened.assigned(current_user)
	11	+ else merge_requests.opened
	12	+ end.page(params[:page]).per(20)
	13	+
	14	+ merge_requests.includes(:author, :project).order("closed, created_at desc")
	15	+ end
	16	+end
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+class SearchContext
	2	+ attr_accessor :project_ids, :params
	3	+
	4	+ def initialize(project_ids, params)
	5	+ @project_ids, @params = project_ids, params.dup
	6	+ end
	7	+
	8	+ def execute
	9	+ query = params[:search]
	10	+
	11	+ return result unless query.present?
	12	+
	13	+ result[:projects] = Project.where(id: project_ids).search(query).limit(10)
	14	+ result[:merge_requests] = MergeRequest.where(project_id: project_ids).search(query).limit(10)
	15	+ result[:issues] = Issue.where(project_id: project_ids).search(query).limit(10)
	16	+ result
	17	+ end
	18	+
	19	+ def result
	20	+ @result \|\|= {
	21	+ projects: [],
	22	+ merge_requests: [],
	23	+ issues: []
	24	+ }
	25	+ end
	26	+end
	27	+
	@@ -8,7 +8,7 @@ class CommitController < ProjectResourceController		@@ -8,7 +8,7 @@ class CommitController < ProjectResourceController
8	before_filter :require_non_empty_project	8	before_filter :require_non_empty_project
9		9
10	def show	10	def show
11	- result = CommitLoad.new(project, current_user, params).execute	11	+ result = CommitLoadContext.new(project, current_user, params).execute
12		12
13	@commit = result[:commit]	13	@commit = result[:commit]
14	git_not_found! unless @commit	14	git_not_found! unless @commit
	@@ -6,7 +6,7 @@ class DashboardController < ApplicationController		@@ -6,7 +6,7 @@ class DashboardController < ApplicationController
6	@projects = current_user.projects_with_events	6	@projects = current_user.projects_with_events
7	@projects = @projects.page(params[:page]).per(20)	7	@projects = @projects.page(params[:page]).per(20)
8		8
9	- @events = Event.recent_for_user(current_user).limit(20).offset(params[:offset] \|\| 0)	9	+ @events = Event.in_projects(current_user.project_ids).limit(20).offset(params[:offset] \|\| 0)
10	@last_push = current_user.recent_push	10	@last_push = current_user.recent_push
11		11
12	respond_to do \|format\|	12	respond_to do \|format\|
	@@ -19,14 +19,14 @@ class DashboardController < ApplicationController		@@ -19,14 +19,14 @@ class DashboardController < ApplicationController
19	# Get authored or assigned open merge requests	19	# Get authored or assigned open merge requests
20	def merge_requests	20	def merge_requests
21	@projects = current_user.projects.all	21	@projects = current_user.projects.all
22	- @merge_requests = current_user.cared_merge_requests.order("created_at DESC").page(params[:page]).per(20)	22	+ @merge_requests = current_user.cared_merge_requests.recent.page(params[:page]).per(20)
23	end	23	end
24		24
25	# Get only assigned issues	25	# Get only assigned issues
26	def issues	26	def issues
27	@projects = current_user.projects.all	27	@projects = current_user.projects.all
28	@user = current_user	28	@user = current_user
29	- @issues = current_user.assigned_issues.opened.order("created_at DESC").page(params[:page]).per(20)	29	+ @issues = current_user.assigned_issues.opened.recent.page(params[:page]).per(20)
30	@issues = @issues.includes(:author, :project)	30	@issues = @issues.includes(:author, :project)
31		31
32	respond_to do \|format\|	32	respond_to do \|format\|
1	class IssuesController < ProjectResourceController	1	class IssuesController < ProjectResourceController
2	before_filter :module_enabled	2	before_filter :module_enabled
3	before_filter :issue, only: [:edit, :update, :destroy, :show]	3	before_filter :issue, only: [:edit, :update, :destroy, :show]
4	- helper_method :issues_filter
5		4
6	# Allow read any issue	5	# Allow read any issue
7	before_filter :authorize_read_issue!	6	before_filter :authorize_read_issue!
	@@ -19,7 +18,6 @@ class IssuesController < ProjectResourceController		@@ -19,7 +18,6 @@ class IssuesController < ProjectResourceController
19		18
20	def index	19	def index
21	@issues = issues_filtered	20	@issues = issues_filtered
22	-
23	@issues = @issues.page(params[:page]).per(20)	21	@issues = @issues.page(params[:page]).per(20)
24		22
25	respond_to do \|format\|	23	respond_to do \|format\|
	@@ -54,7 +52,7 @@ class IssuesController < ProjectResourceController		@@ -54,7 +52,7 @@ class IssuesController < ProjectResourceController
54		52
55	respond_to do \|format\|	53	respond_to do \|format\|
56	format.html do	54	format.html do
57	- if @issue.valid?	55	+ if @issue.valid?
58	redirect_to project_issue_path(@project, @issue)	56	redirect_to project_issue_path(@project, @issue)
59	else	57	else
60	render :new	58	render :new
	@@ -69,7 +67,7 @@ class IssuesController < ProjectResourceController		@@ -69,7 +67,7 @@ class IssuesController < ProjectResourceController
69		67
70	respond_to do \|format\|	68	respond_to do \|format\|
71	format.js	69	format.js
72	- format.html do	70	+ format.html do
73	if @issue.valid?	71	if @issue.valid?
74	redirect_to [@project, @issue]	72	redirect_to [@project, @issue]
75	else	73	else
	@@ -134,35 +132,6 @@ class IssuesController < ProjectResourceController		@@ -134,35 +132,6 @@ class IssuesController < ProjectResourceController
134	end	132	end
135		133
136	def issues_filtered	134	def issues_filtered
137	- @issues = case params[:f]
138	- when issues_filter[:all] then @project.issues
139	- when issues_filter[:closed] then @project.issues.closed
140	- when issues_filter[:to_me] then @project.issues.opened.assigned(current_user)
141	- else @project.issues.opened
142	- end
143	-
144	- @issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present?
145	- @issues = @issues.includes(:author, :project).order("updated_at")
146	-
147	- # Filter by specific assignee_id (or lack thereof)?
148	- if params[:assignee_id].present?
149	- @issues = @issues.where(assignee_id: (params[:assignee_id] == '0' ? nil : params[:assignee_id]))
150	- end
151	-
152	- # Filter by specific milestone_id (or lack thereof)?
153	- if params[:milestone_id].present?
154	- @issues = @issues.where(milestone_id: (params[:milestone_id] == '0' ? nil : params[:milestone_id]))
155	- end
156	-
157	- @issues
158	- end
159	-
160	- def issues_filter
161	- {
162	- all: "all",
163	- closed: "closed",
164	- to_me: "assigned-to-me",
165	- open: "open"
166	- }	135	+ @issues = IssuesListContext.new(project, current_user, params).execute
167	end	136	end
168	end	137	end
	@@ -18,7 +18,7 @@ class MergeRequestsController < ProjectResourceController		@@ -18,7 +18,7 @@ class MergeRequestsController < ProjectResourceController
18		18
19		19
20	def index	20	def index
21	- @merge_requests = MergeRequestsLoad.new(project, current_user, params).execute	21	+ @merge_requests = MergeRequestsLoadContext.new(project, current_user, params).execute
22	end	22	end
23		23
24	def show	24	def show
	@@ -55,7 +55,7 @@ class MergeRequestsController < ProjectResourceController		@@ -55,7 +55,7 @@ class MergeRequestsController < ProjectResourceController
55	@merge_request.reload_code	55	@merge_request.reload_code
56	redirect_to [@project, @merge_request], notice: 'Merge request was successfully created.'	56	redirect_to [@project, @merge_request], notice: 'Merge request was successfully created.'
57	else	57	else
58	- render action: "new"	58	+ render action: "new"
59	end	59	end
60	end	60	end
61		61
	@@ -70,7 +70,7 @@ class MergeRequestsController < ProjectResourceController		@@ -70,7 +70,7 @@ class MergeRequestsController < ProjectResourceController
70	end	70	end
71		71
72	def automerge_check	72	def automerge_check
73	- if @merge_request.unchecked?	73	+ if @merge_request.unchecked?
74	@merge_request.check_if_can_be_merged	74	@merge_request.check_if_can_be_merged
75	end	75	end
76	render json: {state: @merge_request.human_state}	76	render json: {state: @merge_request.human_state}
	@@ -125,7 +125,7 @@ class MergeRequestsController < ProjectResourceController		@@ -125,7 +125,7 @@ class MergeRequestsController < ProjectResourceController
125		125
126	def validates_merge_request	126	def validates_merge_request
127	# Show git not found page if target branch doesnt exist	127	# Show git not found page if target branch doesnt exist
128	- return git_not_found! unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)	128	+ return git_not_found! unless @project.repo.heads.map(&:name).include?(@merge_request.target_branch)
129		129
130	# Show git not found page if source branch doesnt exist	130	# Show git not found page if source branch doesnt exist
131	# and there is no saved commits between source & target branch	131	# and there is no saved commits between source & target branch
	@@ -136,7 +136,7 @@ class MergeRequestsController < ProjectResourceController		@@ -136,7 +136,7 @@ class MergeRequestsController < ProjectResourceController
136	# Build a note object for comment form	136	# Build a note object for comment form
137	@note = @project.notes.new(noteable: @merge_request)	137	@note = @project.notes.new(noteable: @merge_request)
138		138
139	- # Get commits from repository	139	+ # Get commits from repository
140	# or from cache if already merged	140	# or from cache if already merged
141	@commits = @merge_request.commits	141	@commits = @merge_request.commits
142	@commits = CommitDecorator.decorate(@commits)	142	@commits = CommitDecorator.decorate(@commits)