Marin Jankovski af5ea92cc4 Merge branch 'master' into login_page ...

Conflicts:
	CHANGELOG

2014-04-07 20:13:37 +02:00

..

confirmations

Added margin between form and button in resend-confirmation form.

2014-02-14 15:45:41 +01:00

mailer

Improve email with confirmation instructions

2013-12-16 21:10:18 +02:00

passwords

Added margin between form and button in reset-password form.

2014-02-11 10:39:13 +01:00

registrations

Style devise views

2014-01-01 20:53:44 +02:00

sessions

Merge branch 'master' into login_page

2014-04-07 20:13:37 +02:00

shared

Use gitlab_config intead of Gitlab.config.gitlab in views

2013-10-17 22:11:41 +03:00

unlocks

Replace old hashes with new 1.9 ruby hashes (rebase)

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