diff options
| author | Alban Peignier | 2018-01-08 11:57:57 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-08 11:57:57 +0100 |
| commit | 5454d6adbcff29e32f7ed8a587ff95c1a8e65d8f (patch) | |
| tree | 1b405e725d052114dd09e5308029b20f47d22aef /Gemfile.lock | |
| parent | 93f747713a2349cb3360e5e53aceac26a0b5d439 (diff) | |
| parent | db678948aba130425b2a4651e46ea7a7cc75721e (diff) | |
| download | chouette-core-5454d6adbcff29e32f7ed8a587ff95c1a8e65d8f.tar.bz2 | |
Merge pull request #208 from af83/5485-first-docker-scripts
First docker scripts. Refs #5485
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e673b7e31..ba1a90a5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -356,6 +356,7 @@ GEM pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) + puma (3.10.0) pundit (1.1.0) activesupport (>= 3.0.0) quiet_assets (1.1.0) @@ -524,7 +525,6 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.13) teaspoon (1.1.5) railties (>= 3.2.5, < 6) teaspoon-jasmine (2.3.4) @@ -650,6 +650,7 @@ DEPENDENCIES polylines pry-byebug pry-rails + puma (~> 3.10.0) pundit quiet_assets rabl @@ -689,7 +690,6 @@ DEPENDENCIES slim-rails (~> 3.1) spring spring-commands-rspec - sqlite3 teaspoon-jasmine therubyracer (~> 0.12) timecop |