diff options
| -rw-r--r-- | Gemfile | 16 | ||||
| -rw-r--r-- | Gemfile.lock | 56 | ||||
| -rw-r--r-- | lib/tasks/ci.rake | 3 |
3 files changed, 39 insertions, 36 deletions
@@ -1,5 +1,9 @@ # coding: utf-8 -source 'http://rubygems.org' +source 'https://rubygems.org' + +# Use https for github +git_source(:github) { |name| "https://github.com/#{name}.git" } +git_source(:af83) { |name| "git@github.com:af83/#{name}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 4.2.8' @@ -29,7 +33,7 @@ gem 'select2-rails', '~> 4.0', '>= 4.0.3' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring', group: :development # ActiveRecord associations on top of PostgreSQL arrays -gem 'has_array_of', git: 'git@github.com:AF83/has_array_of.git' +gem 'has_array_of', af83: 'has_array_of' gem 'rails-observers' @@ -60,9 +64,9 @@ gem 'activerecord-postgis-adapter', "~> 3.0.0" gem 'polylines' # Codifligne API -gem 'codifligne', git: 'git@github.com:AF83/stif-codifline-api.git' +gem 'codifligne', af83: 'stif-codifline-api' # Reflex API -gem 'reflex', git: 'git@github.com:AF83/stif-reflex-api.git' +gem 'reflex', af83: 'stif-reflex-api' # Authentication gem 'devise', '~> 3.5.4' @@ -105,7 +109,7 @@ gem 'google-analytics-rails' # Model gem 'will_paginate' gem 'ransack' -gem "squeel", :git => "git://github.com/activerecord-hackery/squeel.git" +gem "squeel", github: 'activerecord-hackery/squeel' gem 'active_attr' gem 'draper' @@ -194,7 +198,7 @@ gem 'devise-i18n' gem 'i18n-tasks' # Rails Assets -source 'http://rails-assets.org' do +source 'https://rails-assets.org' do gem 'rails-assets-footable', '~> 2.0.3' # Use twitter bootstrap resources diff --git a/Gemfile.lock b/Gemfile.lock index d220788ab..4e1337ec5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,28 +1,5 @@ GIT - remote: git://github.com/activerecord-hackery/squeel.git - revision: 5542266d502db8022e14105f9dfb455a79d6fc4a - specs: - squeel (1.2.3) - activerecord (>= 3.0) - activesupport (>= 3.0) - polyamorous (~> 1.1.0) - -GIT - remote: git://github.com/af83/language_engine.git - revision: c4d7d5af781b55c1df4806c3960caf3c22f1ee96 - specs: - language_engine (0.0.7) - rails (~> 4.2) - -GIT - remote: git://github.com/af83/whenever.git - revision: b7963381a11243affe4f35881c85be0710f434e3 - specs: - whenever (0.9.4) - chronic (>= 0.6.3) - -GIT - remote: git@github.com:AF83/has_array_of.git + remote: git@github.com:af83/has_array_of.git revision: a6439d93291c7a1ca224ea95a8d39ed101e2f05f specs: has_array_of (0.0.1) @@ -31,22 +8,45 @@ GIT railties (>= 4.0) GIT - remote: git@github.com:AF83/stif-codifline-api.git + remote: git@github.com:af83/stif-codifline-api.git revision: 02108a647514ca36e4377deecf3ffcce99359139 specs: codifligne (0.0.2) nokogiri (~> 1.6) GIT - remote: git@github.com:AF83/stif-reflex-api.git + remote: git@github.com:af83/stif-reflex-api.git revision: 7c517b98c3900c9bb0b81dd0ccab97f8e8f5f249 specs: reflex (0.0.1) nokogiri (~> 1.6) +GIT + remote: https://github.com/activerecord-hackery/squeel.git + revision: 5542266d502db8022e14105f9dfb455a79d6fc4a + specs: + squeel (1.2.3) + activerecord (>= 3.0) + activesupport (>= 3.0) + polyamorous (~> 1.1.0) + +GIT + remote: https://github.com/af83/language_engine.git + revision: c4d7d5af781b55c1df4806c3960caf3c22f1ee96 + specs: + language_engine (0.0.7) + rails (~> 4.2) + +GIT + remote: https://github.com/af83/whenever.git + revision: b7963381a11243affe4f35881c85be0710f434e3 + specs: + whenever (0.9.4) + chronic (>= 0.6.3) + GEM - remote: http://rubygems.org/ - remote: http://rails-assets.org/ + remote: https://rubygems.org/ + remote: https://rails-assets.org/ specs: RedCloth (4.3.2) SyslogLogger (2.0) diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index b4dc677c8..926d10aca 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -39,5 +39,4 @@ namespace :ci do end desc "Run continuous integration tasks (spec, ...)" -task :ci => ["ci:setup", "spec", "teaspoon", "cucumber", "ci:deploy", "ci:clean"] -# task :ci => ["ci:setup", "spec", "cucumber", "ci:check_security", "ci:deploy", "ci:clean"] +task :ci => ["ci:setup", "spec", "teaspoon", "cucumber", "ci:check_security", "ci:deploy", "ci:clean"] |