Riyad Preukschas db2c15369c Merge branch 'master' into discussions ...

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

2012-12-23 01:03:57 +01:00

..

commit_spec.rb

Cache the value of safe_message

2012-10-02 19:00:41 -04:00

event_spec.rb

Fixed event.allowed? with event.proper?

2012-12-14 21:54:49 +02:00

group_spec.rb

Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces

2012-11-29 12:39:03 +02:00

issue_spec.rb

Annotated. schema updated

2012-11-19 21:24:05 +03:00

key_spec.rb

Annotated. schema updated

2012-11-19 21:24:05 +03:00

merge_request_spec.rb

Split commit_id and noteable_id for Note

2012-12-18 20:02:00 +02:00

milestone_spec.rb

Annotated. schema updated

2012-11-19 21:24:05 +03:00

namespace_spec.rb

Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces

2012-11-29 12:39:03 +02:00

note_spec.rb

Merge branch 'master' into discussions

2012-12-23 01:03:57 +01:00

project_hooks_spec.rb

Update uses of Gitolite.config.foo settings

2012-12-20 16:54:28 +01:00

project_security_spec.rb

Rewrite project security model tests

2012-12-05 17:06:15 +02:00

project_spec.rb

Update uses of Gitolite.config.foo settings

2012-12-20 16:54:28 +01:00

protected_branch_spec.rb

Annotated. schema updated

2012-11-19 21:24:05 +03:00

service_hook_spec.rb

Reannotated

2012-11-20 14:19:55 +02:00

service_spec.rb

Reannotated

2012-11-20 14:19:55 +02:00

snippet_spec.rb

Annotated. schema updated

2012-11-19 21:24:05 +03:00

system_hook_spec.rb

Implement UsersProject project_access validation

2012-12-22 19:52:28 +02:00

user_spec.rb

Account role spec

2012-12-16 18:27:16 +02:00

users_project_spec.rb

Implement UsersProject project_access validation

2012-12-22 19:52:28 +02:00

web_hook_spec.rb

Reannotated

2012-11-20 14:19:55 +02:00

wiki_spec.rb

Annotated. schema updated

2012-11-19 21:24:05 +03:00