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

Conflicts:
	app/helpers/oauth_helper.rb
	db/schema.rb

2015-03-21 20:41:10 -07:00

..

confirmations

Clean up devise views.

2015-02-05 19:12:47 +01:00

mailer

Update to accomodate devise deprecations and backward incompatible changes.

2014-07-10 13:56:35 +02:00

passwords

Clean up devise views.

2015-02-05 19:12:47 +01:00

registrations

Move OAuth signin options just below signin box.

2015-02-13 15:16:17 +01:00

sessions

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

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

shared

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

2015-03-21 20:41:10 -07:00

unlocks

Replace old hashes with new 1.9 ruby hashes (rebase)

2013-05-05 18:01:10 +04:00