diff --git a/Gemfile b/Gemfile index 70d09d03344a671b67b225f620c7f1ee2987d256..edec4b7f812caf2af0cb6b27f81ebd7c14e8f631 100644 --- a/Gemfile +++ b/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' diff --git a/Gemfile.lock b/Gemfile.lock index d0e534202e69a3c7090556051aab303ee7a7787c..75035b78d269be03c6c4fe9f976243d541bde854 100644 --- a/Gemfile.lock +++ b/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) diff --git a/app/views/admin/communication/website/pages/jekyll.html.erb b/app/views/admin/communication/website/pages/jekyll.html.erb index 16629fafabcfdfb45fb52529582a35d6bfc107dd..8d5582b042996db27d8b22135a353d1d868c50c9 100644 --- a/app/views/admin/communication/website/pages/jekyll.html.erb +++ b/app/views/admin/communication/website/pages/jekyll.html.erb @@ -1,6 +1,7 @@ --- title: "<%= @page.title %>" permalink: "<%= @page.path %>" +identifier: "<%= @page.id %>" parent: "<%= @page.parent_id %>" description: > <%= prepare_for_github @page.description %>