Merge pull request #23 from adrien1018/master

Merge develop and development into master and solve errors

.gitignore

@@ -7,6 +7,9 @@
 /tempioj
 /sql\ dump
 
+# Ignore announcements.
+/public/announcement/anno
+
 # Ignore bundler config.
 /.bundle
 
@@ -28,6 +31,7 @@
 /public/pmisc
 /public/pimgs
 /public/pcontest
+/public/STL
 
 # Ignore binaries
 /bin
@@ -36,7 +40,9 @@
 /public/assets
 /app/views/problems/._form.html.erb.swp
 /config/config.yml
-/config/database.yml.example
 /config/secrets.yml
 
 
+# Ignore Docker stuffs
+Dockerfile
+docker-compose.yml

Gemfile

@@ -1,28 +1,29 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 4.0.2'
+gem 'rails', '~> 4.2'
 
 # Use mysql2 as the database for Active Record
-gem 'mysql2', '~> 0.3.21'
+gem 'mysql2' 
 
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.0'
+gem 'sass-rails'
 gem 'less'
 gem 'less-rails'
 gem 'less-rails-bootstrap'
+gem 'sprockets', '3.6.3'
 # user
-gem 'devise', '~> 3.2.4'
+gem 'devise', '3.5.10'
 gem 'omniauth'
 gem 'omniauth-facebook'
 # Use Redcarpet to render Markdown
 gem 'redcarpet'
 
 # Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier'
 
 # Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
+gem 'coffee-rails'
 gem 'therubyracer'
 
 # use Kaminari to paginate
@@ -37,7 +38,8 @@ gem 'jquery-rails'
 #gem 'turbolinks'
 #gem 'jquery-turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.2'
+gem 'json'
+gem 'jbuilder'
 
 # nested form: https://github.com/ryanb/nested_form
 gem "nested_form"
@@ -53,7 +55,7 @@ gem "mathjax-rails"
 gem 'acts-as-taggable-on'
 
 # Active Admin, db admin tool: https://github.com/gregbell/active_admin
-gem 'activeadmin', github: 'gregbell/active_admin'
+gem 'activeadmin', github: 'activeadmin/activeadmin'
 
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.
@@ -82,3 +84,6 @@ gem 'annotate', github: 'ctran/annotate_models'
 
 gem 'seo_helper', '~> 1.0', :git => 'git://github.com/techbang/seo_helper.git'
 gem 'nokogiri' #getting old tioj probs
+
+# Timezone data
+gem 'tzinfo-data'