summaryrefslogtreecommitdiff
path: root/users/lib/leap_web_users
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-11 09:47:12 -0700
committerjessib <jessib@riseup.net>2012-10-11 09:47:12 -0700
commit336d5f786bbd1aaf1847007db64e55f96e585b9d (patch)
tree0a18244ba8d21ed821c52edb2d44544b5358aa26 /users/lib/leap_web_users
parentcf9ed38ab1840092352efdbb71bfeb5bc3b9f9d5 (diff)
parent09003d3d2df7c250d3a0b55e83094e5e27094859 (diff)
Merge branch 'develop' into help_develop
Conflicts: .gitignore
Diffstat (limited to 'users/lib/leap_web_users')
-rw-r--r--users/lib/leap_web_users/engine.rb5
-rw-r--r--users/lib/leap_web_users/version.rb3
2 files changed, 2 insertions, 6 deletions
diff --git a/users/lib/leap_web_users/engine.rb b/users/lib/leap_web_users/engine.rb
index b6ab60e..9b7545e 100644
--- a/users/lib/leap_web_users/engine.rb
+++ b/users/lib/leap_web_users/engine.rb
@@ -1,8 +1,7 @@
# thou shall require all your dependencies in an engine.
-require "ruby-srp"
require "leap_web_core"
-LeapWebCore::Dependencies.require_ui_gems
-
+require "leap_web_core/ui_dependencies"
+require "ruby-srp"
module LeapWebUsers
class Engine < ::Rails::Engine
diff --git a/users/lib/leap_web_users/version.rb b/users/lib/leap_web_users/version.rb
deleted file mode 100644
index 14e54c1..0000000
--- a/users/lib/leap_web_users/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module LeapWebUsers
- VERSION = "0.0.1"
-end