28 Jan, 2013

1 commit


15 Jan, 2013

2 commits

  • 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
    Riyad Preukschas
     
  • Riyad Preukschas
     

02 Jan, 2013

3 commits


23 Dec, 2012

1 commit


22 Dec, 2012

1 commit


03 Dec, 2012

1 commit


26 Nov, 2012

1 commit


25 Nov, 2012

1 commit


23 Nov, 2012

4 commits


22 Nov, 2012

1 commit


19 Nov, 2012

1 commit


13 Nov, 2012

1 commit


10 Oct, 2012

1 commit

  • * 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.
    Robb Kidd
     

03 Oct, 2012

2 commits


02 Oct, 2012

1 commit


27 Sep, 2012

1 commit


26 Sep, 2012

1 commit


24 Sep, 2012

1 commit


06 Sep, 2012

1 commit


04 Sep, 2012

2 commits


29 Aug, 2012

2 commits


28 Aug, 2012

4 commits


27 Aug, 2012

1 commit


19 Jul, 2012

2 commits


29 May, 2012

1 commit


09 Apr, 2012

1 commit


28 Mar, 2012

1 commit