File obs-server-2.5.3-0003-dist-trying-new-gems.patch of Package obs-server

Overview Repositories Revisions Requests Users Attributes Meta

File obs-server-2.5.3-0003-dist-trying-new-gems.patch of Package obs-server

From 356127309895f077f6ac6f54be90dd037c80d007 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.de>
Date: Sat, 22 Feb 2014 07:51:55 +0100
Subject: [PATCH 3/4] [dist] trying new gems

---
 src/api/Gemfile.lock                               | 74 +++++++++++-----------
 .../javascripts/webui/application/cm2/index.js     |  1 -
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock
index 6638de9..a023d5d 100644
--- a/src/api/Gemfile.lock
+++ b/src/api/Gemfile.lock
@@ -32,7 +32,7 @@ GEM
       railties (>= 3.1.0)
       sass-rails (>= 3.1.0)
     builder (3.1.4)
-    capybara (2.2.0)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -41,28 +41,28 @@ GEM
     capybara_minitest_spec (1.0.1)
       capybara (>= 2)
       minitest (>= 2)
-    chunky_png (1.2.9)
-    ci_reporter (1.9.0)
+    chunky_png (1.3.0)
+    ci_reporter (1.9.1)
       builder (>= 2.1.2)
-    cliver (0.3.1)
-    clockwork (0.7.0)
+    cliver (0.3.2)
+    clockwork (0.7.2)
       activesupport
-      tzinfo (~> 0.3.35)
-    codemirror-rails (3.16)
+      tzinfo
+    codemirror-rails (3.22)
       railties (>= 3.0, < 5)
     coderay (1.1.0)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     cssmin (1.0.3)
     daemons (1.1.9)
-    dalli (2.6.4)
+    dalli (2.7.0)
     database_cleaner (1.2.0)
     delayed_job (4.0.0)
       activesupport (>= 3.0, < 4.1)
     delayed_job_active_record (4.0.0)
       activerecord (>= 3.0, < 4.1)
       delayed_job (>= 3.0, < 4.1)
-    docile (1.1.1)
+    docile (1.1.3)
     erubis (2.7.0)
     escape_utils (1.0.0)
     execjs (2.0.2)
@@ -71,9 +71,9 @@ GEM
     flog (4.2.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.4)
-    font-awesome-rails (4.0.3.0)
+    font-awesome-rails (4.0.3.1)
       railties (>= 3.2, < 5.0)
-    haml (4.0.4)
+    haml (4.0.5)
       tilt
     hike (1.2.3)
     hoptoad_notifier (2.4.11)
@@ -83,20 +83,20 @@ GEM
     innertube (1.1.0)
     jquery-datatables-rails (1.12.2)
       jquery-rails
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.1.0)
-      railties (>= 3.1.0)
+    jquery-ui-rails (4.2.0)
+      railties (>= 3.2.16)
     json (1.8.1)
-    kaminari (0.15.0)
+    kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     method_source (0.8.2)
     middleware (0.1.0)
     mime-types (1.25)
@@ -104,25 +104,25 @@ GEM
     minitest (4.7.4)
     minitest-colorize (0.0.5)
       minitest (>= 2.0)
-    mocha (0.14.0)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    mysql2 (0.3.14)
-    nokogiri (1.6.0)
+    multi_json (1.8.4)
+    mysql2 (0.3.15)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    pkg-config (1.1.4)
+    pkg-config (1.1.5)
     poltergeist (1.5.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyglot (0.3.3)
-    pry (0.9.12.4)
+    polyglot (0.3.4)
+    pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rack-mini-profiler (0.1.31)
+    rack-mini-profiler (0.9.0)
       rack (>= 1.1.3)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -141,21 +141,21 @@ GEM
       activesupport (= 4.0.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.12.0)
-    rake (10.1.0)
-    rdoc (4.0.1)
+    raindrops (0.13.0)
+    rake (10.1.1)
+    rdoc (4.1.1)
       json (~> 1.4)
     riddle (1.5.9)
     ruby-ldap (0.9.16)
-    ruby_parser (3.2.2)
+    ruby_parser (3.4.1)
       sexp_processor (~> 4.1)
-    safe_yaml (0.9.7)
-    sass (3.2.12)
+    safe_yaml (1.0.1)
+    sass (3.2.14)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    sexp_processor (4.4.0)
+    sexp_processor (4.4.1)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -163,7 +163,7 @@ GEM
     simplecov-html (0.8.0)
     slop (3.4.7)
     sprite-factory (1.5.3)
-    sprockets (2.10.1)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -182,12 +182,12 @@ GEM
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
-    timecop (0.7.0)
+    timecop (0.7.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    uglifier (2.3.2)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicorn (4.7.0)
@@ -197,7 +197,7 @@ GEM
     unicorn-rails (1.1.0)
       rack
       unicorn
-    webmock (1.16.0)
+    webmock (1.17.3)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
     websocket-driver (0.3.1)
diff --git a/src/api/app/assets/javascripts/webui/application/cm2/index.js b/src/api/app/assets/javascripts/webui/application/cm2/index.js
index e98ac90..8a7c9b9 100644
--- a/src/api/app/assets/javascripts/webui/application/cm2/index.js
+++ b/src/api/app/assets/javascripts/webui/application/cm2/index.js
@@ -35,7 +35,6 @@
 //= require codemirror/modes/lua.js
 //= require codemirror/modes/markdown.js
 //= require codemirror/modes/ntriples.js
-//= require codemirror/modes/ocaml.js
 //= require codemirror/modes/pascal.js
 //= require codemirror/modes/perl.js
 //= require codemirror/modes/php.js
-- 
1.9.3

Places

File obs-server-2.5.3-0003-dist-trying-new-gems.patch of Package obs-server

Places