Merge branch 'develop' into help_develop

Conflicts:
	help/test/functional/tickets_controller_test.rb
	users/test/functional/application_controller_test.rb
	users/test/support/auth_test_helper.rb

1 files changed, 0 insertions, 189 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 6792476..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,189 +0,0 @@
-PATH
-  remote: certs
-  specs:
-    leap_web_certs (0.1.0)
-      leap_web_core (= 0.1.0)
-
-PATH
-  remote: core
-  specs:
-    leap_web_core (0.1.0)
-      couchrest (~> 1.1.3)
-      couchrest_model (~> 2.0.0.beta2)
-      couchrest_session_store (~> 0.0.1)
-      json
-      rails (~> 3.2.8)
-
-PATH
-  remote: help
-  specs:
-    leap_web_help (0.1.0)
-      leap_web_core (= 0.1.0)
-
-PATH
-  remote: users
-  specs:
-    leap_web_users (0.1.0)
-      leap_web_core (= 0.1.0)
-      ruby-srp (~> 0.1.4)
-
-GEM
-  remote: https://rubygems.org/
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    bootstrap-sass (2.1.0.0)
-    builder (3.0.3)
-    coffee-rails (3.2.2)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.3.3)
-    columnize (0.3.6)
-    couchrest (1.1.3)
-      mime-types (~> 1.15)
-      multi_json (~> 1.0)
-      rest-client (~> 1.6.1)
-    couchrest_model (2.0.0.beta2)
-      activemodel (~> 3.0)
-      couchrest (~> 1.1.3)
-      mime-types (~> 1.15)
-      tzinfo (~> 0.3.22)
-    couchrest_session_store (0.0.1)
-      couchrest
-      couchrest_model
-    erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    haml (3.1.7)
-    haml-rails (0.3.5)
-      actionpack (>= 3.1, < 4.1)
-      activesupport (>= 3.1, < 4.1)
-      haml (~> 3.1)
-      railties (>= 3.1, < 4.1)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.5)
-    libv8 (3.3.10.4)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.19)
-    mocha (0.12.6)
-      metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
-      bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rbx-require-relative (0.0.9)
-    rdoc (3.12)
-      json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-srp (0.1.4)
-    sass (3.2.1)
-    sass-rails (3.2.5)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    simple_form (2.0.4)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.10.2)
-      libv8 (~> 3.3.10)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    uglifier (1.2.7)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bootstrap-sass (~> 2.1.0)
-  coffee-rails (~> 3.2.2)
-  haml (~> 3.1.7)
-  haml-rails (~> 0.3.4)
-  jquery-rails
-  leap_web_certs!
-  leap_web_core!
-  leap_web_help!
-  leap_web_users!
-  mocha
-  ruby-debug
-  sass-rails (~> 3.2.5)
-  simple_form
-  therubyracer
-  uglifier (~> 1.2.7)