diff options
| author | jessib <jessib@leap.se> | 2012-12-18 13:47:46 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-12-18 13:47:46 -0800 |
| commit | af5fc4b6b89583d81d5e495cd778d7e3b41dc828 (patch) | |
| tree | 56153e7c967882cd04712c1e2e69fc9231373fac /core | |
| parent | 05fd50e769e00e2f63eb4e0eae44ecbc47a6606a (diff) | |
| parent | e899e5c3f33acb3228fac295013d7cc8b6e4eb04 (diff) | |
Merge branch 'master' into feature/tickets-refactor
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" |