Commit Graph

7 Commits

Author SHA1 Message Date
Alexander Machehin dfbf8a8d58 Merge branch 'master' into 90-pull
Fucking conflicts:
	app/controllers/projects/issues_controller.rb
	app/models/ability.rb
	app/views/projects/issues/show.html.haml
	config/routes.rb
	db/schema.rb
	lib/tasks/import.rake
	spec/models/comment_for_commit_spec.rb
	vendor/assets/javascripts/bootstrap-tab.js
	vendor/assets/stylesheets/bootstrap.css
2012-09-25 17:55:30 +06:00
Alexander Machehin d775fa0d08 [refs #616] ugly md preview 2012-08-29 21:24:06 +06:00
Alexander Machehin 9b41fd50af [refs #90] fixed translation of titles & headers 2012-06-26 15:40:37 +06:00
Alexander Machehin 4ad39b05c0 [refs #90] model PullRequest, tests 2012-04-28 23:30:54 +06:00
Alexander Machehin a8ccf454ee [refs #90] first steps of pull rendering 2012-04-23 23:34:11 +06:00
Alexander Machehin 5cfadcd723 [refs #385] add dropdown menu to choose archive format 2012-04-13 17:24:24 +06:00
Alexander Machehin e349a69883 [refs #353] can fork project to group 2012-04-09 23:56:03 +06:00