Fixing conflicts #211

tutor/.gitignore

@@ -37,3 +37,7 @@ Gemfile.lock, .ruby-version, .ruby-gemset
 
 # Ignoring generated model diagram
 models.svg
+
+# Ignoring .java and .class files
+/students_solutions/Java/*.java
+/students_solutions/Class/*.class

tutor/Gemfile

@@ -5,9 +5,16 @@ ruby '2.1.0'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.0.4'
 
+# User authentication
+gem 'devise'
+
+# File uploading
+# gem 'carrierwave'
+# gem 'rmagick'
+
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
-gem 'devise'
+
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.2'
 
@@ -47,7 +54,15 @@ gem 'foreman'
 # Use debugger
 # gem 'debugger', group: [:development, :test]
 
-# User authentication
-
 # Use composite primary keys in models
 gem 'composite_primary_keys', '~> 6.0.1'
+
+#
+gem 'acts_as_list'
+
+#search
+gem 'tire'
+gem 'json_builder', '3.1.0'
+
+# whenever gem for scheduling tasks
+gem 'whenever', :require => false

tutor/Gemfile.lock

@@ -25,10 +25,13 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
+    acts_as_list (0.4.0)
+      activerecord (>= 3.0)
+    ansi (1.4.3)
     arel (4.0.2)
-    atomic (1.1.16)
     bcrypt (3.1.7)
     builder (3.1.4)
+    chronic (0.10.2)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -44,12 +47,13 @@ GEM
       railties (>= 3.2.6, < 5)
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    dotenv (0.10.0)
+    dotenv (0.7.0)
     erubis (2.7.0)
     execjs (2.0.2)
     foreman (0.63.0)
       dotenv (>= 0.7)
       thor (>= 0.13.6)
+    hashr (0.0.22)
     hike (1.2.3)
     i18n (0.6.9)
     jbuilder (1.5.3)
@@ -59,6 +63,8 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
+    json_builder (3.1.0)
+      activesupport (>= 2.0.0)
     kgio (2.9.2)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -85,15 +91,17 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (10.1.1)
+    rake (10.3.1)
     rdoc (4.1.1)
       json (~> 1.4)
-    sass (3.2.17)
-    sass-rails (4.0.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    sass (3.2.19)
+    sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2.0)
       sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0.0)
+      sprockets-rails (~> 2.0)
     sdoc (0.4.0)
       json (~> 1.8)
       rdoc (~> 4.0, < 5.0)
@@ -107,14 +115,21 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.9)
-    thor (0.19.0)
-    thread_safe (0.3.1)
-      atomic (>= 1.1.7, < 2)
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
+    tire (0.6.2)
+      activemodel (>= 3.0)
+      activesupport
+      ansi
+      hashr (~> 0.0.19)
+      multi_json (~> 1.3)
+      rake
+      rest-client (~> 1.6)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.2.1)
+    turbolinks (2.2.2)
       coffee-rails
     tzinfo (0.3.39)
     uglifier (2.5.0)
@@ -126,21 +141,28 @@ GEM
       raindrops (~> 0.7)
     warden (1.2.3)
       rack (>= 1.0)
+    whenever (0.9.2)
+      activesupport (>= 2.3.4)
+      chronic (>= 0.6.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  acts_as_list
   coffee-rails (~> 4.0.0)
   composite_primary_keys (~> 6.0.1)
   devise
   foreman
   jbuilder (~> 1.2)
   jquery-rails (~> 3.1.0)
+  json_builder (= 3.1.0)
   rails (= 4.0.4)
   sass-rails (~> 4.0.2)
   sdoc
   sqlite3
+  tire
   turbolinks
   uglifier (>= 1.3.0)
   unicorn
+  whenever