diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 7 |
2 files changed, 6 insertions, 3 deletions
| diff --git a/Gemfile b/Gemfile index d57baba..39251a1 100644 --- a/Gemfile +++ b/Gemfile | |||
| @@ -65,7 +65,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] | |||
| 65 | gem 'haml' | 65 | gem 'haml' |
| 66 | gem 'normalize-rails' | 66 | gem 'normalize-rails' |
| 67 | gem 'devise' | 67 | gem 'devise' |
| 68 | gem 'ckeditor' | 68 | gem 'ckeditor', '~> 4.2.4' |
| 69 | gem 'paperclip' | 69 | gem 'paperclip' |
| 70 | gem 'jquery-rails' | 70 | gem 'jquery-rails' |
| 71 | gem 'pokeviewer', github: "hatkirby/pokeviewer" | 71 | gem 'pokeviewer', github: "hatkirby/pokeviewer" |
| diff --git a/Gemfile.lock b/Gemfile.lock index 3788876..a2b75e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock | |||
| @@ -95,9 +95,12 @@ GEM | |||
| 95 | rack-test (>= 0.5.4) | 95 | rack-test (>= 0.5.4) |
| 96 | xpath (>= 2.0, < 4.0) | 96 | xpath (>= 2.0, < 4.0) |
| 97 | childprocess (3.0.0) | 97 | childprocess (3.0.0) |
| 98 | ckeditor (5.1.0) | 98 | ckeditor (4.2.4) |
| 99 | cocaine | ||
| 99 | orm_adapter (~> 0.5.0) | 100 | orm_adapter (~> 0.5.0) |
| 100 | climate_control (0.2.0) | 101 | climate_control (0.2.0) |
| 102 | cocaine (0.6.0) | ||
| 103 | terrapin (= 0.6.0) | ||
| 101 | coffee-rails (4.2.2) | 104 | coffee-rails (4.2.2) |
| 102 | coffee-script (>= 2.2.0) | 105 | coffee-script (>= 2.2.0) |
| 103 | railties (>= 4.0.0) | 106 | railties (>= 4.0.0) |
| @@ -284,7 +287,7 @@ DEPENDENCIES | |||
| 284 | capistrano-rails | 287 | capistrano-rails |
| 285 | capistrano-rvm | 288 | capistrano-rvm |
| 286 | capybara (~> 2.13) | 289 | capybara (~> 2.13) |
| 287 | ckeditor | 290 | ckeditor (~> 4.2.4) |
| 288 | coffee-rails (~> 4.2) | 291 | coffee-rails (~> 4.2) |
| 289 | devise | 292 | devise |
| 290 | enumerize | 293 | enumerize |