621affecb5
Conflicts: Gemfile.lock app/helpers/application_helper.rb app/views/devise/sessions/new.html.erb db/schema.rb |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
database.yml.example | ||
database.yml.mysql | ||
database.yml.sqlite | ||
environment.rb | ||
gitlab.yml.example | ||
routes.rb | ||
unicorn.rb.orig |