spec/models · 8c604c9d31561dc364173626923d568bf76414ba · Forest Godfrey / gitlab-ce

Merge branch 'master' into discussions · db2c1536

authored Dec 23, 2012

Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb

db2c1536

Name	Last commit	Last update
..
commit_spec.rb		Loading commit data...
event_spec.rb		Loading commit data...
group_spec.rb		Loading commit data...
issue_spec.rb		Loading commit data...
key_spec.rb		Loading commit data...
merge_request_spec.rb		Loading commit data...
milestone_spec.rb		Loading commit data...
namespace_spec.rb		Loading commit data...
note_spec.rb		Loading commit data...
project_hooks_spec.rb		Loading commit data...
project_security_spec.rb		Loading commit data...
project_spec.rb		Loading commit data...
protected_branch_spec.rb		Loading commit data...
service_hook_spec.rb		Loading commit data...
service_spec.rb		Loading commit data...
snippet_spec.rb		Loading commit data...
system_hook_spec.rb		Loading commit data...
user_spec.rb		Loading commit data...
users_project_spec.rb		Loading commit data...
web_hook_spec.rb		Loading commit data...
wiki_spec.rb		Loading commit data...