OSDN Git Service

Rebase on master
authorIzaak Alpert <ialpert@blackberry.com>
Wed, 26 Jun 2013 20:45:57 +0000 (16:45 -0400)
committerIzaak Alpert <ialpert@blackberry.com>
Thu, 18 Jul 2013 02:45:03 +0000 (22:45 -0400)
commit09112dbb1df2669b0042d6d785a5469a9855ac20
tree588ab6efb0d54df955b9701ac46cdf0d3c3d1cc5
parentbbef8bb5896d8858bf91692bdd5aa9236472a885
Rebase on master

Trying to retrigger travis
Change-Id: Ifd86fb4c6b2791ad176230254fbf69a9ade979fb
app/models/merge_request.rb
app/observers/merge_request_observer.rb
features/steps/project/project_merge_requests.rb
spec/contexts/filter_context_spec.rb
spec/services/notification_service_spec.rb