Skip to content
This repository has been archived by the owner on Oct 12, 2019. It is now read-only.

Working on version 3.2 #127

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ doc
.yardoc

# bundler
.bundle
/.bundle
/Gemfile.lock
/vendor/bundle

# rspec logs
log
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: ruby
rvm:
- 1.8.7
- 1.9.3
- 2.0.0
- 2.1
Expand Down
5 changes: 1 addition & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,5 @@ source "https://rubygems.org"
gemspec

group :development, :test do
gem 'devtools', git: 'https://github.com/mbj/devtools.git'
gem 'pry'
end

# Added by devtools
eval_gemfile 'Gemfile.devtools'
305 changes: 0 additions & 305 deletions Gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.0
3.1.1
4 changes: 3 additions & 1 deletion formtastic-bootstrap.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ Gem::Specification.new do |s|
s.add_development_dependency('rake')
s.add_development_dependency('tzinfo')
s.add_development_dependency('bundler')
s.add_development_dependency('nokogiri', ["< 1.6.0"])
s.add_development_dependency('nokogiri')
s.add_development_dependency('rspec', ["~> 3.0"])
s.add_development_dependency('rspec-rails', ["~> 3.0"])
s.add_development_dependency('rspec_tag_matchers', ["~> 1.0"])
s.add_development_dependency('ammeter', ["~> 0.2"])
s.add_development_dependency('actionpack', ["~> 3.2"])
Expand Down
2 changes: 1 addition & 1 deletion lib/formtastic-bootstrap/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module FormtasticBootstrap
VERSION = "3.1.0"
VERSION = "3.1.1"
end