update ruby 2.1.4

baac0c67 · tady · 53fb244d · baac0c67 · baac0c67 · baac0c67
Commit baac0c67 authored Nov 02, 2014 by tady
Hide whitespace changes
Inline Side-by-side

Showing with 109 additions and 13 deletions

.travis.yml
+1 -1

Gemfile
+1 -1

Gemfile.lock
+105 -0

README.md
+2 -11

No files found.
--- a/.travis.yml
+++ b/.travis.yml
 bundler_args: "--without development --path=~/.bundle"
 language: ruby
 rvm:
- 2.1.2
+- 2.1.4
 env:
  matrix:
  - DB_TEST_DATABASE=rendezvous_test DB_TEST_USER=travis

--- a/Gemfile
+++ b/Gemfile
 source 'https://rubygems.org'
-ruby '2.1.2'
+ruby '2.1.4'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 4.1'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -193,6 +193,111 @@ GEM
    i18n_generators (1.2.1)
      mechanize
      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
+      rails (>= 3.0.0)
    jbuilder (2.2.4)
      activesupport (>= 3.0.0, < 5)
      multi_json (~> 1.2)

--- a/README.md
+++ b/README.md
@@ -11,8 +11,7 @@ A simple markdown-based blog & wiki system for team.
 # Supported versions
- Ruby 2+
+- Ruby 2.1.4
- Rails 4.1+
 # How to install and use.
@@ -41,15 +40,7 @@ and get
  -`rendevous` in [Project name] in Consent screen
-## Create and edit config files.
+## Dotenv
-```
-$ cp config/database.yml.example config/database.yml
-$ vim config/database.yml
-$ cp config/settings.yml.example config/settings.yml
-$ vim config/settings.yml
-```
 ## Setup DB