OSDN Git Service

Merge branch 'master' into reference_relative_links
authorMarin Jankovski <marin@gitlab.com>
Fri, 24 Jan 2014 13:02:11 +0000 (14:02 +0100)
committerMarin Jankovski <marin@gitlab.com>
Fri, 24 Jan 2014 13:02:11 +0000 (14:02 +0100)
commit54bcb6cc2a863e10abdd76745d3a0d50c301ab77
treeb374b46630cb1663ff8b6657a895b8087242fcfe
parentd819d0d1f84946bcc0d2c871682c220db6dbd478
parentd1d138562a347ec78f0331d5242e28fbb368bad0
Merge branch 'master' into reference_relative_links

Conflicts:
spec/models/project_spec.rb
features/steps/project/project_markdown_render.rb
spec/helpers/gitlab_markdown_helper_spec.rb
spec/lib/gitlab/satellite/merge_action_spec.rb
spec/models/project_spec.rb