621affecb5
Conflicts: Gemfile.lock app/helpers/application_helper.rb app/views/devise/sessions/new.html.erb db/schema.rb |
||
---|---|---|
.. | ||
application_helper.rb | ||
commits_helper.rb | ||
gitlab_markdown_helper.rb | ||
issues_helper.rb | ||
merge_requests_helper.rb | ||
projects_helper.rb | ||
snippets_helper.rb | ||
tab_helper.rb | ||
tags_helper.rb | ||
tree_helper.rb |