diff --git a/Gemfile b/Gemfile index 1b754918..59c00150 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,6 @@ gem 'SystemTimer', :platforms => :ruby_18 gem 'cells' gem 'sanitize' gem 'highline' -gem 'crack' # The rest of the dependencies are for use when in the locomotive dev environment diff --git a/Gemfile.lock b/Gemfile.lock index 8a13e225..dc9d4c27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -292,7 +292,6 @@ DEPENDENCIES capybara carrierwave (= 0.5.6) cells - crack cucumber-rails (= 1.0.2) custom_fields (= 1.0.0.beta.25) database_cleaner diff --git a/config/locales/admin_ui.fr.yml b/config/locales/admin_ui.fr.yml index 7dd38a9d..067f4398 100644 --- a/config/locales/admin_ui.fr.yml +++ b/config/locales/admin_ui.fr.yml @@ -175,7 +175,7 @@ fr: pt-BR: "en Portugais" it: "en Italien" nl: "en Hollandais" - "no": Norvégiennes + "no": "en Norvégien" es: en Espagnol ru: en Russe diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec index 11f824a6..f1047bd7 100644 --- a/locomotive_cms.gemspec +++ b/locomotive_cms.gemspec @@ -55,7 +55,6 @@ Gem::Specification.new do |s| s.add_dependency 'delayed_job_mongoid', '1.0.2' s.add_dependency 'rubyzip' s.add_dependency 'locomotive_jammit-s3' - s.add_dependency 'crack' s.files = Dir[ 'Gemfile', '{app}/**/*',