Skip to content
This repository has been archived by the owner on Aug 1, 2018. It is now read-only.

Fix gemspec #65

Open
wants to merge 5 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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
sudo: false
language: ruby
rvm:
- 1.9.2
Expand Down
18 changes: 3 additions & 15 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source :rubygems
source 'https://rubygems.org'

# Declare your gem's dependencies in active_admin_editor.gemspec.
# Bundler will treat runtime dependencies like base dependencies, and
Expand All @@ -9,23 +9,11 @@ gem 'meta_search'
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
gem 'activeadmin'
gem 'konacha'

# jquery-rails is used by the dummy application
gem 'jquery-rails'
gem 'ejs'
gem 'konacha'
gem 'chai-jquery-rails'
gem 'sinon-chai-rails'
gem 'sinon-rails'
gem 'ejs'

group :development, :test do
end

# Declare any dependencies that are still in development here instead of in
# your gemspec. These might include edge Rails or gems from your path or
# Git. Remember to move these dependencies to your gemspec before releasing
# your gem to rubygems.org.

# To use debugger
# gem 'ruby-debug19', :require => 'ruby-debug'
16 changes: 10 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PATH
rails (>= 3.0.0)

GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
actionmailer (3.2.9)
actionpack (= 3.2.9)
Expand Down Expand Up @@ -132,8 +132,10 @@ GEM
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
mime-types (1.19)
mini_portile2 (2.0.0)
multi_json (1.7.7)
nokogiri (1.5.6)
nokogiri (1.6.7)
mini_portile2 (~> 2.0.0.rc2)
orm_adapter (0.4.0)
poltergeist (1.0.2)
capybara (~> 1.1)
Expand Down Expand Up @@ -186,16 +188,16 @@ GEM
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rubyzip (0.9.9)
rubyzip (1.1.7)
sass (3.2.4)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.33.0)
selenium-webdriver (2.39.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
rubyzip (~> 1.0)
websocket (~> 1.0.4)
sinon-chai-rails (1.0.2)
railties (>= 3.1)
Expand Down Expand Up @@ -227,7 +229,6 @@ PLATFORMS

DEPENDENCIES
active_admin_editor!
activeadmin
capybara (~> 1.1.4)
chai-jquery-rails
coffee-rails
Expand All @@ -246,3 +247,6 @@ DEPENDENCIES
sinon-rails
sqlite3
uglifier

BUNDLED WITH
1.10.6
1 change: 0 additions & 1 deletion active_admin_editor.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Gem::Specification.new do |s|
s.add_development_dependency 'factory_girl_rails'
s.add_development_dependency 'database_cleaner', '~> 0.9.1'
s.add_development_dependency 'capybara', '~> 1.1.4'
s.add_development_dependency 'activeadmin', '~> 0.4.3'
s.add_development_dependency 'poltergeist', '~> 1.0.2'
s.add_development_dependency 'faker'

Expand Down