diff options
| author | Azul <azul@leap.se> | 2012-12-18 02:13:51 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-18 02:13:51 +0100 |
| commit | d56a009ce084bd14dbd5a876010961caca16da5c (patch) | |
| tree | 50cb41b8326f4764e3e08bf55aa88bbe948e1bf2 /core | |
| parent | d37fe6ada458b80019d16803fc73e5c406dc515f (diff) | |
| parent | c8d01944816277f2e0361c1fce0f4b1a94b3f66f (diff) | |
Merge branch 'feature/clean-up-pjax-for-now' of https://github.com/leapcode/leap_web
Diffstat (limited to 'core')
| -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" |