From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 9 Mar 2015 09:10:48 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=f52063ee557c4afcf17159a026da17681c9beda7;hp=a658532da47f71832746864658be36376391f4fa;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc

Conflicts:
	tmpl/pb_entry.en
---

diff --git a/js/90-divine-format.js b/js/90-divine-format.js
index cb9b6ab..1fff289 100644
--- a/js/90-divine-format.js
+++ b/js/90-divine-format.js
@@ -41,6 +41,9 @@
 		case 'py':
 			format = 'PYTHON';
 			break;
+		case 'rb':
+			format = 'RUBY';
+			break;
 		}
 
 		if(format)
diff --git a/tmpl/pb_entry.en b/tmpl/pb_entry.en
index ebb947c..208c3ce 100644
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@ -40,6 +40,7 @@ To submit solutions to this problem, please visit the problem <a href="/pb/id">o
 <option value="PASCAL">Pascal (fpc 2.6.0)</option>
 <option value="PERL">Perl (perl 5.14.2)</option>
 <option value="PYTHON">Python (python 2.7.3)</option>
+<option value="RUBY">Ruby (ruby 2.2.1)</option>
 <option value="SBCL">Common Lisp (sbcl 1.0.57)</option>
 </select></div>