diff options
| author | Azul <azul@leap.se> | 2012-12-18 02:29:45 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-18 02:29:45 +0100 |
| commit | cd0c59ae6177b8b93971735887657314b6888a3c (patch) | |
| tree | d39b06cd424e3345a3cba97f56a44c920c06ec97 /core/lib | |
| parent | be2d8fbd65f4ed2e1e97b19a3322da20e2fb4eda (diff) | |
| parent | e899e5c3f33acb3228fac295013d7cc8b6e4eb04 (diff) | |
Merge branch 'master' into feature/removing-email-aliases
Diffstat (limited to 'core/lib')
| -rw-r--r-- | core/lib/leap_web_core/dependencies.rb | 1 | ||||
| -rw-r--r-- | core/lib/leap_web_core/ui_dependencies.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/core/lib/leap_web_core/dependencies.rb b/core/lib/leap_web_core/dependencies.rb index 00ef515..7f6ca87 100644 --- a/core/lib/leap_web_core/dependencies.rb +++ b/core/lib/leap_web_core/dependencies.rb @@ -11,7 +11,6 @@ module LeapWebCore "haml" => "~> 3.1.7", "bootstrap-sass" => "~> 2.0.4", "jquery-rails" => nil, - "pjax_rails" => nil, "simple_form" => nil } diff --git a/core/lib/leap_web_core/ui_dependencies.rb b/core/lib/leap_web_core/ui_dependencies.rb index 8ca9b91..e0a0b86 100644 --- a/core/lib/leap_web_core/ui_dependencies.rb +++ b/core/lib/leap_web_core/ui_dependencies.rb @@ -2,7 +2,6 @@ require "haml" require "bootstrap-sass" require "jquery-rails" require "simple_form" -require "pjax_rails" if Rails.env == "development" require "haml-rails" |