diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 46 |
1 files changed, 14 insertions, 32 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7948f3fb5bc..2c821a9b907 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,4 @@ GIT - remote: https://github.com/gitlabhq/gon.git - revision: 58ca8e17273051cb370182cabd3602d1da6783ab - ref: 58ca8e17273051cb370182cabd3602d1da6783ab - specs: - gon (4.1.1) - actionpack (>= 2.3.0) - json - -GIT remote: https://github.com/gitlabhq/markup.git revision: 61ade389c1e1c159359338f570d18464a44ddbc4 ref: 61ade389c1e1c159359338f570d18464a44ddbc4 @@ -64,7 +55,7 @@ GEM erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (2.3.2.2) + bootstrap-sass (3.0.3.0) sass (~> 3.2) builder (3.1.4) capybara (2.1.0) @@ -80,12 +71,6 @@ GEM celluloid (0.15.2) timers (~> 1.1.0) charlock_holmes (0.6.9.4) - chosen-rails (1.0.1) - coffee-rails (>= 3.2) - compass-rails (>= 1.0) - railties (>= 3.0) - sass-rails (>= 3.2) - chunky_png (1.2.9) cliver (0.2.2) code_analyzer (0.4.3) sexp_processor @@ -101,12 +86,6 @@ GEM coffee-script-source (1.6.3) colored (1.2) colorize (0.5.8) - compass (0.12.2) - chunky_png (~> 1.2) - fssm (>= 0.2.7) - sass (~> 3.1) - compass-rails (1.1.1) - compass (>= 0.12.2) connection_pool (1.2.0) coveralls (0.7.0) multi_json (~> 1.3) @@ -135,6 +114,8 @@ GEM email_spec (1.5.0) launchy (~> 2.1) mail (~> 2.2) + email_validator (1.4.0) + activemodel enumerize (0.7.0) activesupport (>= 3.2) equalizer (0.0.8) @@ -170,7 +151,6 @@ GEM dotenv (>= 0.7) thor (>= 0.13.6) formatador (0.2.4) - fssm (0.2.10) gemoji (1.3.1) gherkin-ruby (0.3.1) racc @@ -212,6 +192,9 @@ GEM omniauth (~> 1.0) pyu-ruby-sasl (~> 0.0.3.1) rubyntlm (~> 0.1.1) + gon (5.0.1) + actionpack (>= 2.3.0) + json grape (0.6.1) activesupport builder @@ -247,7 +230,7 @@ GEM railties (~> 4.0.0) hashie (2.0.5) hike (1.2.3) - hipchat (0.9.0) + hipchat (0.14.0) httparty httparty http_parser.rb (0.5.3) @@ -276,7 +259,7 @@ GEM json (1.8.1) jwt (0.1.8) multi_json (>= 1.5) - kaminari (0.14.1) + kaminari (0.15.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.8.1) @@ -298,7 +281,7 @@ GEM minitest (4.7.5) modernizr (2.6.2) sprockets (~> 2.0) - multi_json (1.8.2) + multi_json (1.8.4) multi_xml (0.5.5) multipart-post (1.2.0) mysql2 (0.3.11) @@ -568,17 +551,15 @@ PLATFORMS DEPENDENCIES actionpack-action_caching actionpack-page_caching - activerecord-deprecated_finders acts-as-taggable-on annotate (~> 2.6.0.beta2) asciidoctor awesome_print better_errors binding_of_caller - bootstrap-sass (~> 2.3) + bootstrap-sass (~> 3.0) capybara carrierwave - chosen-rails (= 1.0.1) coffee-rails colored coveralls @@ -587,6 +568,7 @@ DEPENDENCIES devise (= 3.0.4) devise-async (= 0.8.0) email_spec + email_validator (~> 1.4.0) enumerize factory_girl_rails ffaker @@ -603,21 +585,21 @@ DEPENDENCIES gitlab_git (~> 4.0.0) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.3) - gon! + gon (~> 5.0.0) grape (~> 0.6.1) grape-entity (~> 0.3.0) growl guard-rspec guard-spinach haml-rails - hipchat (~> 0.9.0) + hipchat (~> 0.14.0) httparty jasmine (= 2.0.0.rc5) jquery-atwho-rails (~> 0.3.3) jquery-rails (= 2.1.3) jquery-turbolinks jquery-ui-rails (= 2.0.2) - kaminari (~> 0.14.1) + kaminari (~> 0.15.1) launchy letter_opener minitest (~> 4.7.0) |