Dmitriy Zaporozhets 3840549566 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb

2015-03-25 09:16:09 -07:00

..

internal_id.rb

Fix method overlap for issue sorting

2015-02-05 16:49:41 -08:00

issuable.rb

tests

2015-03-16 21:38:41 +02:00

mentionable.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-11 18:41:41 -07:00

notifiable.rb

Huge replace of old users_project and users_group references

2014-09-14 19:32:51 +03:00

sortable.rb

Fix tests for semaphore

2015-02-06 23:57:28 -08:00

taskable.rb

Fix nested task lists

2015-03-21 08:45:28 -06:00

token_authenticatable.rb

Try to keep token authenticable compatibility

2014-07-09 14:42:25 +02:00