consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert Gemfile.lock changes by mistake, also remove Gemfile gem version specification

Browse Source
This commit is contained in:
Bertocq
2017-05-23 20:26:39 +02:00
parent d922d093ee
commit 6b89bdd17d
2 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Gemfile
View File

@@ -17,7 +17,7 @@ gem 'coffee-rails', '~> 4.2.1'
gem 'jquery-rails', '~> 4.3.1'
gem 'jquery-ui-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks', '~> 2.5.3'
gem 'turbolinks'
# Fix sprockets on the
gem 'sprockets', '~> 3.7.1'
@@ -33,7 +33,7 @@ gem 'omniauth-google-oauth2', '~> 0.4.0'
gem 'kaminari', '~> 1.0.1'
gem 'ancestry', '~> 2.2.2'
gem 'acts-as-taggable-on', '~> 4.0.0'
gem 'acts-as-taggable-on'
gem 'responders', '~> 2.4.0'
gem 'foundation-rails', '~> 6.2.4.0'
gem 'foundation_rails_helper', '~> 2.0.0'
@@ -61,7 +61,7 @@ gem 'ahoy_matey', '~> 1.6.0'
gem 'groupdate', '~> 3.2.0' # group temporary data
gem 'tolk', '~> 2.0.0' # Web interface for translations
gem 'browser', '~> 2.3.0'
gem 'browser'
gem 'turnout', '~> 2.4.0'
gem 'redcarpet', '~> 3.4.0'
gem 'rubyzip', '~> 1.2.0'
@@ -72,7 +72,7 @@ group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring', '~> 2.0.1'
gem 'spring'
gem 'spring-commands-rspec'
gem 'rspec-rails', '~> 3.6'
gem 'capybara', '~> 2.14.0'
@@ -94,10 +94,10 @@ group :development, :test do
end
group :test do
gem 'database_cleaner', '~> 1.5.3'
gem 'database_cleaner'
gem 'poltergeist', '~> 1.15.0'
gem 'coveralls', '~> 0.8.21', require: false
gem 'email_spec', '~> 2.1.0'
gem 'email_spec'
end
group :development do

54
Gemfile.lock
View File

@@ -97,7 +97,7 @@ GEM
ckeditor (4.2.3)
cocaine
orm_adapter (~> 0.5.0)
climate_control (0.2.0)
climate_control (0.1.0)
cliver (0.3.2)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
@@ -118,7 +118,7 @@ GEM
daemons (1.2.4)
dalli (2.7.6)
database_cleaner (1.5.3)
debug_inspector (0.0.3)
debug_inspector (0.0.2)
delayed_job (4.1.2)
activesupport (>= 3.0, < 5.1)
delayed_job_active_record (4.1.1)
@@ -142,10 +142,10 @@ GEM
json
thread
thread_safe
email_spec (2.1.1)
email_spec (2.1.0)
htmlentities (~> 4.3.3)
launchy (~> 2.1)
mail (~> 2.6)
mail (~> 2.6.3)
errbase (0.0.3)
erubis (2.7.0)
execjs (2.7.0)
@@ -171,9 +171,9 @@ GEM
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
geocoder (1.4.4)
globalid (0.4.0)
activesupport (>= 4.2.0)
geocoder (1.4.3)
globalid (0.3.7)
activesupport (>= 4.1.0)
groupdate (3.2.0)
activesupport (>= 3)
gyoku (1.3.1)
@@ -181,9 +181,8 @@ GEM
hashie (3.5.5)
highline (1.7.8)
htmlentities (4.3.4)
httpi (2.4.2)
httpi (2.4.1)
rack
socksify
i18n (0.8.1)
i18n-tasks (0.9.15)
activesupport (>= 4.0.2)
@@ -240,7 +239,7 @@ GEM
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_portile2 (2.1.0)
minitest (5.10.2)
minitest (5.10.1)
multi_json (1.12.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
@@ -251,7 +250,7 @@ GEM
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
nori (2.6.0)
oauth (0.5.2)
oauth (0.5.1)
oauth2 (1.3.1)
faraday (>= 0.8, < 0.12)
jwt (~> 1.0)
@@ -301,7 +300,7 @@ GEM
public_suffix (2.0.5)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.8)
rack (1.6.5)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (5.0.1)
@@ -376,7 +375,7 @@ GEM
safe_yaml (1.0.4)
safely_block (0.2.0)
errbase
sass (3.4.24)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
@@ -395,13 +394,12 @@ GEM
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
simplecov-html (0.10.0)
sitemap_generator (5.3.1)
builder (~> 3.0)
social-share-button (0.10.0)
coffee-rails
socksify (1.7.1)
spring (2.0.2)
spring (2.0.1)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
@@ -421,14 +419,14 @@ GEM
net-ssh (>= 2.8.0)
term-ansicolor (1.6.0)
tins (~> 1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
terminal-table (1.7.3)
unicode-display_width (~> 1.1.1)
thor (0.19.4)
thread (0.2.2)
thread_safe (0.3.6)
tilt (2.0.7)
timecop (0.8.1)
tins (1.14.0)
tins (1.13.2)
tolk (2.0.0)
rails (>= 4.0)
safe_yaml (>= 0.8.6)
@@ -443,14 +441,14 @@ GEM
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.2.1)
unicode-display_width (1.1.3)
unicorn (5.3.0)
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.10.0)
user_agent_parser (2.3.1)
user_agent_parser (2.3.0)
uuidtools (2.1.5)
warden (1.2.7)
warden (1.2.6)
rack (>= 1.0)
wasabi (3.5.0)
httpi (~> 2.0)
@@ -471,11 +469,11 @@ PLATFORMS
ruby
DEPENDENCIES
acts-as-taggable-on (~> 4.0.0)
acts-as-taggable-on
acts_as_votable
ahoy_matey (~> 1.6.0)
ancestry (~> 2.2.2)
browser (~> 2.3.0)
browser
bullet (~> 5.5.1)
byebug
cancancan (~> 1.16.0)
@@ -489,12 +487,12 @@ DEPENDENCIES
coveralls (~> 0.8.21)
daemons
dalli
database_cleaner (~> 1.5.3)
database_cleaner
delayed_job_active_record (~> 4.1.0)
devise (~> 3.5.7)
devise-async
devise_security_extension
email_spec (~> 2.1.0)
email_spec
factory_girl_rails (~> 4.8.0)
faker (~> 1.7.3)
foundation-rails (~> 6.2.4.0)
@@ -534,11 +532,11 @@ DEPENDENCIES
savon
sitemap_generator (~> 5.3.1)
social-share-button (~> 0.10)
spring (~> 2.0.1)
spring
spring-commands-rspec
sprockets (~> 3.7.1)
tolk (~> 2.0.0)
turbolinks (~> 2.5.3)
turbolinks
turnout (~> 2.4.0)
uglifier (~> 3.2.0)
unicorn (~> 5.3.0)