Download as
Browse Code »

Commit f08464c055420f9091512a3f9ec1dc2de960fbde

Authored by Dmitriy Zaporozhets
1 parent 80daf9a7
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Remove author_id_of_changes from app 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 11 changed files with 12 additions and 23 deletions   Show diff stats
app/controllers/projects/issues_controller.rb
  Diff comments   View file @f08464c
... ... @@ -76,7 +76,7 @@ class Projects::IssuesController &lt; Projects::ApplicationController
76 76 end
77 77  
78 78 def update
79   - @issue.update_attributes(params[:issue].merge(author_id_of_changes: current_user.id))
  79 + @issue.update_attributes(params[:issue])
80 80 @issue.reset_events_cache
81 81  
82 82 respond_to do |format|
... ...
app/controllers/projects/merge_requests_controller.rb
  Diff comments   View file @f08464c
... ... @@ -109,7 +109,7 @@ class Projects::MergeRequestsController &lt; Projects::ApplicationController
109 109 params[:merge_request].delete(:source_project_id)
110 110 params[:merge_request].delete(:target_project_id)
111 111  
112   - if @merge_request.update_attributes(params[:merge_request].merge(author_id_of_changes: current_user.id))
  112 + if @merge_request.update_attributes(params[:merge_request])
113 113 @merge_request.reset_events_cache
114 114  
115 115 respond_to do |format|
... ...
app/controllers/projects/milestones_controller.rb
  Diff comments   View file @f08464c
... ... @@ -38,7 +38,6 @@ class Projects::MilestonesController &lt; Projects::ApplicationController
38 38  
39 39 def create
40 40 @milestone = @project.milestones.new(params[:milestone])
41   - @milestone.author_id_of_changes = current_user.id
42 41  
43 42 if @milestone.save
44 43 redirect_to project_milestone_path(@project, @milestone)
... ... @@ -48,7 +47,7 @@ class Projects::MilestonesController &lt; Projects::ApplicationController
48 47 end
49 48  
50 49 def update
51   - @milestone.update_attributes(params[:milestone].merge(author_id_of_changes: current_user.id))
  50 + @milestone.update_attributes(params[:milestone])
52 51  
53 52 respond_to do |format|
54 53 format.js
... ...
app/models/concerns/issuable.rb
  Diff comments   View file @f08464c
... ... @@ -37,8 +37,6 @@ module Issuable
37 37 allow_nil: true,
38 38 prefix: true
39 39  
40   - attr_accessor :author_id_of_changes
41   -
42 40 attr_mentionable :title, :description
43 41 end
44 42  
... ...
app/models/issue.rb
  Diff comments   View file @f08464c
... ... @@ -30,8 +30,7 @@ class Issue &lt; ActiveRecord::Base
30 30 scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) }
31 31  
32 32 attr_accessible :title, :assignee_id, :position, :description,
33   - :milestone_id, :label_list, :author_id_of_changes,
34   - :state_event
  33 + :milestone_id, :label_list, :state_event
35 34  
36 35 acts_as_taggable_on :labels
37 36  
... ...
app/models/merge_request.rb
  Diff comments   View file @f08464c
... ... @@ -38,7 +38,7 @@ class MergeRequest &lt; ActiveRecord::Base
38 38  
39 39 delegate :commits, :diffs, :last_commit, :last_commit_short_sha, to: :merge_request_diff, prefix: nil
40 40  
41   - attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event, :description
  41 + attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :state_event, :description
42 42  
43 43 attr_accessor :should_remove_source_branch
44 44  
... ...
app/models/milestone.rb
  Diff comments   View file @f08464c
... ... @@ -16,8 +16,7 @@
16 16 class Milestone < ActiveRecord::Base
17 17 include InternalId
18 18  
19   - attr_accessible :title, :description, :due_date, :state_event, :author_id_of_changes
20   - attr_accessor :author_id_of_changes
  19 + attr_accessible :title, :description, :due_date, :state_event
21 20  
22 21 belongs_to :project
23 22 has_many :issues
... ... @@ -89,6 +88,6 @@ class Milestone &lt; ActiveRecord::Base
89 88 end
90 89  
91 90 def author_id
92   - author_id_of_changes
  91 + nil
93 92 end
94 93 end
... ...
app/observers/activity_observer.rb
  Diff comments   View file @f08464c
... ... @@ -2,8 +2,6 @@ class ActivityObserver &lt; BaseObserver
2 2 observe :issue, :note, :milestone
3 3  
4 4 def after_create(record)
5   - event_author_id = record.author_id
6   -
7 5 if record.kind_of?(Note)
8 6 # Skip system notes, like status changes and cross-references.
9 7 return true if record.system?
... ... @@ -12,9 +10,7 @@ class ActivityObserver &lt; BaseObserver
12 10 return true if record.noteable_type.blank?
13 11 end
14 12  
15   - if event_author_id
16   - create_event(record, Event.determine_action(record))
17   - end
  13 + create_event(record, Event.determine_action(record)) if current_user
18 14 end
19 15  
20 16 def after_close(record, transition)
... ...
app/services/merge_requests/auto_merge_service.rb
  Diff comments   View file @f08464c
... ... @@ -9,11 +9,10 @@ module MergeRequests
9 9 merge_request.lock
10 10  
11 11 if Gitlab::Satellite::MergeAction.new(current_user, merge_request).merge!(commit_message)
12   - merge_request.author_id_of_changes = current_user.id
13 12 merge_request.merge
14 13  
15 14 notification.merge_mr(merge_request, current_user)
16   - create_merge_event(merge_request)
  15 + create_merge_event(merge_request, current_user)
17 16 execute_project_hooks(merge_request)
18 17  
19 18 true
... ...
app/services/merge_requests/base_merge_service.rb
  Diff comments   View file @f08464c
... ... @@ -7,13 +7,13 @@ module MergeRequests
7 7 NotificationService.new
8 8 end
9 9  
10   - def create_merge_event(merge_request)
  10 + def create_merge_event(merge_request, current_user)
11 11 Event.create(
12 12 project: merge_request.target_project,
13 13 target_id: merge_request.id,
14 14 target_type: merge_request.class.name,
15 15 action: Event::MERGED,
16   - author_id: merge_request.author_id_of_changes
  16 + author_id: current_user.id
17 17 )
18 18 end
19 19  
... ...
app/services/merge_requests/merge_service.rb
  Diff comments   View file @f08464c
... ... @@ -7,11 +7,10 @@ module MergeRequests
7 7 # to target branch
8 8 class MergeService < BaseMergeService
9 9 def execute(merge_request, current_user, commit_message)
10   - merge_request.author_id_of_changes = current_user.id
11 10 merge_request.merge
12 11  
13 12 notification.merge_mr(merge_request, current_user)
14   - create_merge_event(merge_request)
  13 + create_merge_event(merge_request, current_user)
15 14 execute_project_hooks(merge_request)
16 15  
17 16 true
... ...