Merge branch 'develop' of github.com:yakut-project/yakut into develop

CHANGELOG.md

@@ -2,6 +2,7 @@
 #### [Current]
 
 #### 
+ * [c338d33](../../commit/c338d33) [#18](../../issues/18) Change default database of development to Sqlite3 __(Ahmet Sezgin Duran)__
  * [f07214a](../../commit/f07214a) [#21](../../issues/21) error class changed __(Muhammet DİLEK)__
  * [52318cd](../../commit/52318cd) [#19](../../issues/19) Fix README.md markdown of Gemnasium __(Ahmet Sezgin Duran)__
  * [664c51a](../../commit/664c51a) [#19](../../issues/19) Add README.md markdowns for Code Climate and Gemnasium __(Ahmet Sezgin Duran)__

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 4.0.0'
-gem 'pg', '~> 0.15.1'
+gem 'pg', '~> 0.16.0'
 gem 'sass-rails', '~> 4.0.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.0.0'
@@ -15,13 +15,13 @@ gem 'exception_notification', '~> 4.0.0'
 gem 'simple_form', '~> 3.0.0.rc'
 gem 'rails_config', '~> 0.3.3'
 gem 'compass-rails', github: 'Compass/compass-rails', branch: 'rails4-hack'
-gem 'devise', '~> 3.0.0'
-gem 'devise-i18n', '~> 0.8.6'
+gem 'devise', '~> 3.1.0'
+gem 'devise-i18n', '~> 0.9.0'
 gem 'will_paginate', '~> 3.0.4'
 gem 'will_paginate-bootstrap', '~> 0.2.3'
 gem 'will-paginate-i18n', '~> 0.1.13'
 gem 'paperclip', '~> 3.5.1'
-gem 'kangal', '~> 0.1.2'
+gem 'kangal', '~> 1.0.0'
 gem 'rack-timeout', '~> 0.0.4'
 gem 'recipient_interceptor', '~> 0.1.2'
 gem 'ransack'
@@ -34,10 +34,10 @@ group :development, :test do
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'letter_opener'
-  gem 'katip'
+  gem 'katip', '~> 1.2.1'
   gem 'rspec-rails', '~> 2.14.0'
   gem 'capybara', '~> 2.1.0'
-  gem 'shoulda-matchers', '~> 2.2.0'
+  gem 'shoulda-matchers', '~> 2.3.0'
   gem 'factory_girl_rails', '~> 4.0'
-  gem 'sqlite3', '1.3.7'
+  gem 'sqlite3', '1.3.8'
 end

Gemfile.lock

@@ -75,12 +75,13 @@ GEM
       fssm (>= 0.2.7)
       sass (~> 3.1)
     debug_inspector (0.0.2)
-    devise (3.0.3)
+    devise (3.1.0)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    devise-i18n (0.8.6)
+    devise-i18n (0.9.0)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     exception_notification (4.0.0)
@@ -106,10 +107,10 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
-    kangal (0.1.2)
+    kangal (1.0.0)
       activemodel
       mail
-    katip (1.1.0)
+    katip (1.2.1)
     launchy (2.3.0)
       addressable (~> 2.3)
     letter_opener (1.1.2)
@@ -129,7 +130,7 @@ GEM
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.0)
       mime-types
-    pg (0.15.1)
+    pg (0.16.0)
     polyamorous (0.6.4)
       activerecord (>= 3.0)
     polyglot (0.3.3)
@@ -182,7 +183,7 @@ GEM
     sdoc (0.3.20)
       json (>= 1.1.3)
       rdoc (~> 3.10)
-    shoulda-matchers (2.2.0)
+    shoulda-matchers (2.3.0)
       activesupport (>= 3.0.0)
     simple_form (3.0.0.rc)
       actionpack (>= 4.0.0.rc1, < 4.1)
@@ -196,7 +197,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.8)
     thor (0.18.1)
     thread_safe (0.1.2)
       atomic
@@ -229,18 +230,18 @@ DEPENDENCIES
   capybara (~> 2.1.0)
   coffee-rails (~> 4.0.0)
   compass-rails!
-  devise (~> 3.0.0)
-  devise-i18n (~> 0.8.6)
+  devise (~> 3.1.0)
+  devise-i18n (~> 0.9.0)
   exception_notification (~> 4.0.0)
   factory_girl_rails (~> 4.0)
   haml (~> 4.0.2)
   haml-rails
   jquery-rails (~> 3.0.4)
-  kangal (~> 0.1.2)
-  katip
+  kangal (~> 1.0.0)
+  katip (~> 1.2.1)
   letter_opener
   paperclip (~> 3.5.1)
-  pg (~> 0.15.1)
+  pg (~> 0.16.0)
   rack-timeout (~> 0.0.4)
   rails (~> 4.0.0)
   rails_config (~> 0.3.3)
@@ -250,9 +251,9 @@ DEPENDENCIES
   rspec-rails (~> 2.14.0)
   sass-rails (~> 4.0.0)
   sdoc
-  shoulda-matchers (~> 2.2.0)
+  shoulda-matchers (~> 2.3.0)
   simple_form (~> 3.0.0.rc)
-  sqlite3 (= 1.3.7)
+  sqlite3 (= 1.3.8)
   turbolinks (~> 1.3.0)
   uglifier (>= 1.3.0)
   will-paginate-i18n (~> 0.1.13)

README.md

@@ -1,3 +1,23 @@
 # Yakut
 [![Code Climate](https://codeclimate.com/github/yakut-project/yakut.png)](https://codeclimate.com/github/yakut-project/yakut)
-[![Dependency Status](https://gemnasium.com/yakut-project/yakut.png)](https://gemnasium.com/yakut-project/yakut)
+[![Dependency Status](https://gemnasium.com/yakut-project/yakut.png)](https://gemnasium.com/yakut-project/yakut)
+[![Build Status](https://travis-ci.org/yakut-project/yakut.png?branch=develop)](https://travis-ci.org/yakut-project/yakut)
+
+Open source project for managing LKD courses. It helps to select the applicants easily.
+
+## REQUIREMENTS
+
+You must have
+
+* Ruby 2.x
+* Rails 4.x
+
+## CONTACT
+
+* [Twitter](https://twitter.com/yakutproject)
+* [Facebook](https://www.facebook.com/yakutproject)
+* Google Groups: [email protected]
+
+## LICENSE
+
+YAKUT is released under the [MIT License](http://www.opensource.org/licenses/MIT)

config/initializers/devise.rb

@@ -5,7 +5,7 @@
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
   config.mailer_sender = "[email protected]"
-
+  config.secret_key = '63571f3411289849e893732b84d77e4f1e61f7259563c078e6b14ac2afc88c3d9a85a7a612eabb961d35871280dd950c30a96429b8f23a10110dd3163066aa56'
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
 

db/schema.rb

@@ -51,4 +51,4 @@
   add_index "users", ["email"], name: "index_users_on_email", unique: true
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
 
-end
+end