Merge branch 'master' of github.com:noesya/osuny

Gemfile

@@ -23,7 +23,7 @@ gem 'devise'
 gem 'devise-i18n'
 gem 'cancancan'
 gem 'simple_form'
-gem 'simple_form_password_with_hints'
+gem 'simple_form_password_with_hints'#, path: '../simple_form_password_with_hints'
 gem 'simple_form_bs5_file_input'#, path: '../simple_form_bs5_file_input'
 gem 'enum_help'
 gem 'enum-i18n'

Gemfile.lock

@@ -330,7 +330,11 @@ GEM
     simple_form_bs5_file_input (0.0.3)
       rails
       simple_form
+<<<<<<< HEAD
+    simple_form_password_with_hints (0.0.4)
+=======
     simple_form_password_with_hints (0.0.3)
+>>>>>>> 353f910894520e230e8ba00dd407158a1901b980
       rails
       simple_form
     sinatra (2.1.0)

app/views/admin/communication/website/pages/jekyll.html.erb

 ---
 title: "<%= @page.title %>"
 permalink: "<%= @page.path %>"
+identifier: "<%= @page.id %>"
 parent: "<%= @page.parent_id %>"
 description: >
   <%= prepare_for_github @page.description %>