From 941b195f689cffcb047c504a010d113d4eb2bf25 Mon Sep 17 00:00:00 2001 From: richie Date: Tue, 11 Oct 2016 23:00:12 -0700 Subject: [PATCH] In .travis.yml, use Rails 3 version that's compatable with Ruby 2.2 --- .gitignore | 2 +- .travis.yml | 2 +- Gemfile.lock | 14 +++++++------- test-app/config/routes.rb | 4 ---- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index bba460a..6bc4d3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ **/*/tmp **/*/log **/*/*.gem -**.*/*.sqlite3 +**/*/*.sqlite3 diff --git a/.travis.yml b/.travis.yml index c982758..644ead3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ nguage: ruby rvm: - 2.2.5 env: - - "RAILS_VERSION=3.2.0" + - "RAILS_VERSION=3.2.22" - "RAILS_VERSION=4.2.0" - "RAILS_VERSION=5.0.0" cache: bundler diff --git a/Gemfile.lock b/Gemfile.lock index 42af638..95d3650 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,18 +5,18 @@ PATH rails (>= 3.1, < 5.1) PATH - remote: ./rswag-ui - specs: - rswag-ui (1.0.0) - rails (>= 3.1, < 5.1) - -PATH - remote: ~/src/rswag/rswag-specs + remote: ./rswag-specs specs: rswag-specs (1.0.0) json-schema (~> 2.2) rails (>= 3.1, < 5.1) +PATH + remote: ./rswag-ui + specs: + rswag-ui (1.0.0) + rails (>= 3.1, < 5.1) + GEM remote: https://rubygems.org/ specs: diff --git a/test-app/config/routes.rb b/test-app/config/routes.rb index 8f8b578..ed6b6ed 100644 --- a/test-app/config/routes.rb +++ b/test-app/config/routes.rb @@ -1,8 +1,4 @@ TestApp::Application.routes.draw do - mount Rswag::Ui::Engine => '/api-docs' - - mount Rswag::Api::Engine => '/api-docs' - resources :blogs, defaults: { :format => :json } mount Rswag::Api::Engine => 'api-docs'