diff options
| author | jessib <jessib@riseup.net> | 2012-10-11 09:47:12 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2012-10-11 09:47:12 -0700 |
| commit | 336d5f786bbd1aaf1847007db64e55f96e585b9d (patch) | |
| tree | 0a18244ba8d21ed821c52edb2d44544b5358aa26 /help/lib | |
| parent | cf9ed38ab1840092352efdbb71bfeb5bc3b9f9d5 (diff) | |
| parent | 09003d3d2df7c250d3a0b55e83094e5e27094859 (diff) | |
Merge branch 'develop' into help_develop
Conflicts:
.gitignore
Diffstat (limited to 'help/lib')
| -rw-r--r-- | help/lib/leap_web_help/engine.rb | 4 | ||||
| -rw-r--r-- | help/lib/leap_web_help/version.rb | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/help/lib/leap_web_help/engine.rb b/help/lib/leap_web_help/engine.rb index 2ff3e86..4146dfc 100644 --- a/help/lib/leap_web_help/engine.rb +++ b/help/lib/leap_web_help/engine.rb @@ -1,8 +1,6 @@ # thou shall require all your dependencies in an engine. require "leap_web_core" -#require "leap_web_users" #necessary? - -LeapWebCore::Dependencies.require_ui_gems +require "leap_web_core/ui_dependencies" module LeapWebHelp class Engine < ::Rails::Engine diff --git a/help/lib/leap_web_help/version.rb b/help/lib/leap_web_help/version.rb deleted file mode 100644 index 6a7c85d..0000000 --- a/help/lib/leap_web_help/version.rb +++ /dev/null @@ -1,3 +0,0 @@ -module LeapWebHelp - VERSION = "0.0.1" -end |