Riyad Preukschas 3022786948 Merge commit 'master' into discussions ...

Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb

2013-01-15 00:52:25 +01:00

..

concerns

Add concerns to autoload

2013-01-03 09:12:24 +02:00

commit_spec.rb

Fixed protected branches and file edit

2013-01-04 21:45:30 +02:00

event_spec.rb

Fixed event.allowed? with event.proper?

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

gitlab_ci_service_spec.rb

Fix some tests. Use travis-ci 1.9.2

2013-01-05 00:43:32 +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

Fixed tests. added test for gitlab_ci_service model

2013-01-03 09:37:13 +02:00

key_spec.rb

Annotated. schema updated

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

merge_request_spec.rb

Tests are fixed now

2013-01-05 12:12:02 +02:00

milestone_spec.rb

Rspec models Milestone, Commit, UsersProject

2013-01-03 19:11:14 +02: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 commit 'master' into discussions

2013-01-15 00:52:25 +01:00

project_hooks_spec.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00

project_security_spec.rb

Project has now correct owner and creator. Increased test coverage

2013-01-02 19:00:00 +02:00

project_spec.rb

Fix some tests. Use travis-ci 1.9.2

2013-01-05 00:43:32 +02:00

protected_branch_spec.rb

Tests are fixed now

2013-01-05 12:12:02 +02:00

repository_spec.rb

Fix some tests. Use travis-ci 1.9.2

2013-01-05 00:43:32 +02: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

sidekiq with green tests

2013-01-09 09:14:05 +03:00

team_spec.rb

use ui-box as for all

2013-01-04 23:35:31 +02:00

user_spec.rb

Fixed tests. added test for gitlab_ci_service model

2013-01-03 09:37:13 +02:00

users_project_spec.rb

Continue refactoring. Use repostory and team

2013-01-04 08:43:25 +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