jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/339193 )

Change subject: clean up and update gems
......................................................................


clean up and update gems

Looks like most of the things are not needed here.

Change-Id: Ic95cd26ebafe828a416e85dd58e1a655cacdd034
---
M Gemfile
M Gemfile.lock
2 files changed, 31 insertions(+), 56 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Gemfile b/Gemfile
index b8d1b27..fdf3f2d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'chunky_png', '~> 1.3.4'
-gem 'jsduck', '~> 5.3.4'
 gem 'mediawiki_selenium', '~> 1.7.0'
 gem 'require_all', '~> 1.3', '>= 1.3.3'
-gem 'rake', '~> 10.4', '>= 10.4.2'
 gem 'rubocop', '~> 0.41.0', require: false
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 0a5a6d9..a1ea72e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,93 +2,76 @@
   remote: http://rubygems.org/
   specs:
     ast (2.3.0)
-    builder (3.2.2)
-    childprocess (0.5.9)
+    builder (3.2.3)
+    childprocess (0.6.2)
       ffi (~> 1.0, >= 1.0.11)
-    chunky_png (1.3.7)
     cucumber (1.3.20)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    data_magic (0.22)
+    data_magic (1.0)
       faker (>= 1.1.2)
       yml_reader (>= 0.6)
-    diff-lcs (1.2.5)
-    dimensions (1.2.0)
-    domain_name (0.5.20161021)
+    diff-lcs (1.3)
+    domain_name (0.5.20170223)
       unf (>= 0.0.5, < 1.0.0)
-    faker (1.6.6)
+    faker (1.7.3)
       i18n (~> 0.5)
-    faraday (0.9.2)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.14)
-    ffi (1.9.14-x86-mingw32)
+    faraday_middleware (0.11.0.1)
+      faraday (>= 0.7.4, < 1.0)
+    ffi (1.9.17)
     gherkin (2.12.2)
-      multi_json (~> 1.3)
-    gherkin (2.12.2-x86-mingw32)
       multi_json (~> 1.3)
     headless (2.3.1)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.7.0)
-    jsduck (5.3.4)
-      dimensions (~> 1.2.0)
-      json (~> 1.8.0)
-      parallel (~> 0.7.1)
-      rdiscount (~> 2.1.6)
-      rkelly-remix (~> 0.0.4)
-    json (1.8.3)
-    mediawiki_api (0.7.0)
+    i18n (0.8.1)
+    json (2.0.3)
+    mediawiki_api (0.7.1)
       faraday (~> 0.9, >= 0.9.0)
       faraday-cookie_jar (~> 0.0, >= 0.0.6)
       faraday_middleware (~> 0.10, >= 0.10.0)
-    mediawiki_selenium (1.7.2)
+    mediawiki_selenium (1.7.4)
       cucumber (~> 1.3, >= 1.3.20)
       headless (~> 2.0, >= 2.1.0)
-      json (~> 1.8, >= 1.8.1)
+      json (~> 2.0, >= 2.0.2)
       mediawiki_api (~> 0.7, >= 0.7.0)
       page-object (~> 1.0)
       rest-client (~> 1.6, >= 1.6.7)
       rspec-core (~> 2.14, >= 2.14.4)
       rspec-expectations (~> 2.14, >= 2.14.4)
+      selenium-webdriver (< 3)
       syntax (~> 1.2, >= 1.2.0)
       thor (~> 0.19, >= 0.19.1)
     mime-types (2.99.3)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
     netrc (0.11.0)
-    page-object (1.2.0)
+    page-object (1.2.2)
+      net-http-persistent (~> 2.9.4)
       page_navigation (>= 0.9)
-      selenium-webdriver (>= 2.44.0)
-      watir-webdriver (>= 0.6.11)
+      selenium-webdriver (>= 2.53.0)
+      watir-webdriver (>= 0.6.11, < 0.9.9)
     page_navigation (0.10)
       data_magic (>= 0.22)
-    parallel (0.7.1)
-    parser (2.3.1.4)
+    parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    rainbow (2.1.0)
-    rake (10.5.0)
-    rdiscount (2.1.8)
-    require_all (1.3.3)
+    rainbow (2.2.1)
+    require_all (1.4.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rest-client (1.8.0-x86-mingw32)
-      ffi (~> 1.9)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rkelly-remix (0.0.7)
     rspec-core (2.99.2)
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
@@ -99,34 +82,29 @@
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    rubyzip (1.2.0)
-    selenium-webdriver (3.0.1)
+    rubyzip (1.2.1)
+    selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
     syntax (1.2.1)
-    thor (0.19.1)
+    thor (0.19.4)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unf_ext (0.0.7.2-x86-mingw32)
-    unicode-display_width (1.1.1)
-    watir-webdriver (0.9.9)
+    unicode-display_width (1.1.3)
+    watir-webdriver (0.9.3)
       selenium-webdriver (>= 2.46.2)
-    websocket (1.2.3)
+    websocket (1.2.4)
     yml_reader (0.7)
 
 PLATFORMS
   ruby
-  x86-mingw32
 
 DEPENDENCIES
-  chunky_png (~> 1.3.4)
-  jsduck (~> 5.3.4)
   mediawiki_selenium (~> 1.7.0)
-  rake (~> 10.4, >= 10.4.2)
   require_all (~> 1.3, >= 1.3.3)
   rubocop (~> 0.41.0)
 
 BUNDLED WITH
-   1.10.6
+   1.14.5

-- 
To view, visit https://gerrit.wikimedia.org/r/339193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic95cd26ebafe828a416e85dd58e1a655cacdd034
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to