git.osdn.net Git - wvm/gitlab.git/commit

author	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Fri, 15 Mar 2013 14:55:07 +0000 (16:55 +0200)
committer	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Fri, 15 Mar 2013 14:55:07 +0000 (16:55 +0200)
commit	71ab011a1711db9a1a9ced2c2c92c8427ae6f624
tree	95e38662d7f022061c2c809f4b6c53067a5df468	tree \| snapshot
parent	4f23c30ace844cdcd2c59da1a758c8a6788ca6f3	commit \| diff
parent	d69a37e0b7163f5a03fcc58fdb6ec0ed1eb20862	commit \| diff

Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis

Conflicts:
app/views/layouts/project_resource.html.haml
app/views/wikis/edit.html.haml
app/views/wikis/pages.html.haml
app/views/wikis/show.html.haml
spec/features/gitlab_flavored_markdown_spec.rb

12 files changed:

RSS Atom

About OSDN

Site Announce
About OSDN
Privacy
Terms of Use
Advertise

Find Software

Search
Find by Categories
Download Ranking
Project Ranking

Develop Software

Create Project/Chamber
What's new
Recently Registered Project
Chambers Map
API

Help

Help Docs
Contact Us
Report Abuse/spam

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/application.scss	diff1 \|	diff2 \|	blob \| history
app/views/layouts/project_resource.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/wikis/edit.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/wikis/pages.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/wikis/show.html.haml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
features/steps/shared/paths.rb	diff1 \|	diff2 \|	blob \| history
features/support/env.rb	diff1 \|	diff2 \|	blob \| history
lib/api/internal.rb	diff1 \|	diff2 \|	blob \| history
spec/features/gitlab_flavored_markdown_spec.rb	diff1 \|	diff2 \|	blob \| history