Merge branch 'master' into reference_relative_links

Conflicts:
	spec/models/project_spec.rb

diff --cc features/steps/project/project_markdown_render.rb
Simple merge

diff --cc spec/helpers/gitlab_markdown_helper_spec.rb
Simple merge

diff --cc spec/lib/gitlab/satellite/merge_action_spec.rb
Simple merge

diff --cc spec/models/project_spec.rb
index 4aef70e,8fe6694..6837e4c
--- 1/spec/models/project_spec.rb
--- 2/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@@ -136,18 -136,17 +136,17 @@@ describe Project d
      end
  
      it "should close merge request if last commit from source branch was pushed to target branch" do
-       @merge_request.reloaded_commits
+       @merge_request.reload_code
 -      @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828"
 -      project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/stable", @key.user)
 +      @merge_request.last_commit.id.should == "69b34b7e9ad9f496f0ad10250be37d6265a03bba"
 +      project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "69b34b7e9ad9f496f0ad10250be37d6265a03bba", "refs/heads/stable", @key.user)
        @merge_request.reload
        @merge_request.merged?.should be_true
      end
  
      it "should update merge request commits with new one if pushed to source branch" do
-       @merge_request.last_commit.should == nil
 -      project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/master", @key.user)
 +      project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "69b34b7e9ad9f496f0ad10250be37d6265a03bba", "refs/heads/master", @key.user)
        @merge_request.reload
 -      @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828"
 +      @merge_request.last_commit.id.should == "69b34b7e9ad9f496f0ad10250be37d6265a03bba"
      end
    end