deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3726 commits 6 branches 43 tags 25 MiB
Commit graph

8 commits

Author SHA1 Message Date
Riyad Preukschas 3022786948 Merge commit 'master' into discussions 
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
 2013-01-15 00:52:25 +01:00
Dmitriy Zaporozhets 71bd956866 email via sidekiq. start and stop rake tasks 2013-01-09 08:44:05 +03:00
Riyad Preukschas 621c6b8533 Fix commit note notification 2013-01-02 20:50:24 +01:00
Johannes Schleifenbaum eededdd4be fix notify_team on wall 2012-12-07 19:36:12 +01:00
Riyad Preukschas 413778b645 Rename NoteObserver methods and clarify things 2012-10-18 01:14:10 +02:00
Robb Kidd 9588a23242 Fix notification for notes on a wall. 
The fact that Notes on Walls have a noteable_type value of "nil" got
lost in the refactoring of the observer.
 2012-10-13 14:37:36 -04:00
Robb Kidd 378fe076b6 Reduce complexity: replace case statement with method lookup. 2012-10-11 13:27:58 -04:00
Robb Kidd 16ceae895e Separate observing of Note and MergeRequests 
* Move is_assigned? and is_being_xx? methods to IssueCommonality

  This is behavior merge requests have in common with issues. Moved
  methods to IssueCommonality role. Put specs directly into
  merge_request_spec because setup differs for issues and MRs
  specifically in the "closed" factory to use.

* Add MergeRequestObserver. Parallels IssueObserver in almost every way.

  Ripe for refactoring.

* Rename MailerObserver to NoteObserver

  With merge request observing moved out of MailerObserver, all that
  was left was Note logic. Renamed to NoteObserver, added tests and
  updated application config for new observer names. Refactored
  NoteObserver to use the note's author and not rely on current_user.

* Set current_user for MergeRequestObserver

  IssueObserver and MergeRequestObserver are the only observers that
  need a reference to the current_user that they cannot look up on
  the objects they are observing.
 2012-10-10 17:59:25 -04:00