diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-06-05 20:21:28 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-06-05 20:21:28 +0200 |
| commit | 2545b0f85851d1e4ebc1137a2c8786a238e02ee4 (patch) | |
| tree | 21a69bc5fb3e8e24d95c41618d1ef5a5be63e70d /Gemfile.lock | |
| parent | a76bf07ae2ecaf47dab58cbeac37cb82ae8d3ad8 (diff) | |
| download | gitlab-ce-2545b0f85851d1e4ebc1137a2c8786a238e02ee4.tar.gz | |
Revert "Fix for failing specs"
This reverts commit 2314438925af827b694fbaaf59c31c49dd2c0c31.
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Conflicts:
Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5124863692a..78561677e7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,7 +62,7 @@ GEM celluloid (0.15.2) timers (~> 1.1.0) charlock_holmes (0.6.9.4) - cliver (0.3.2) + cliver (0.2.2) code_analyzer (0.4.3) sexp_processor coderay (1.1.0) @@ -283,9 +283,9 @@ GEM treetop (~> 1.4.8) method_source (0.8.2) mime-types (1.25.1) - mini_portile (0.6.0) - minitest (5.3.4) - multi_json (1.10.1) + mini_portile (0.5.3) + minitest (4.7.5) + multi_json (1.10.0) multi_xml (0.5.5) multipart-post (1.2.0) mysql2 (0.3.16) @@ -293,8 +293,8 @@ GEM net-scp (1.1.2) net-ssh (>= 2.6.5) net-ssh (2.8.0) - nokogiri (1.6.2.1) - mini_portile (= 0.6.0) + nokogiri (1.6.1) + mini_portile (~> 0.5.0) nprogress-rails (0.1.2.3) oauth (0.4.7) oauth2 (0.8.1) @@ -326,9 +326,9 @@ GEM orm_adapter (0.5.0) pg (0.15.1) phantomjs (1.9.2.0) - poltergeist (1.5.1) - capybara (~> 2.1) - cliver (~> 0.3.1) + poltergeist (1.4.1) + capybara (~> 2.1.0) + cliver (~> 0.2.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) polyglot (0.3.4) @@ -562,7 +562,7 @@ GEM webmock (1.16.0) addressable (>= 2.2.7) crack (>= 0.3.2) - websocket-driver (0.3.3) + websocket-driver (0.3.1) xpath (2.0.0) nokogiri (~> 1.3) @@ -578,7 +578,7 @@ DEPENDENCIES better_errors binding_of_caller bootstrap-sass (~> 3.0) - capybara (~> 2.2.1) + capybara carrierwave coffee-rails colored @@ -635,7 +635,7 @@ DEPENDENCIES omniauth-twitter org-ruby pg - poltergeist (~> 1.5.1) + poltergeist (~> 1.4.1) protected_attributes pry quiet_assets (~> 1.0.1) |