Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #305 from skyarch-networks/develop
Pre release 1.21.0
  • Loading branch information
Joeper214 committed Aug 17, 2016
2 parents d9d1ded + 38eeb26 commit 4c7dcd4
Show file tree
Hide file tree
Showing 59 changed files with 1,259 additions and 168 deletions.
10 changes: 7 additions & 3 deletions Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.2.5.2'
gem 'rails', '~> 4.2.7.1'

# Use mysql as the database for Active Record
gem 'mysql2', '~> 0.3.20'
Expand Down Expand Up @@ -59,6 +59,9 @@ gem 'foreman', require: false

gem "bootstrap-table-rails"

# Temporarily set ruby_dep version to 1.3.1 because it requires ruby 2.2.5 that is not yet available on amazon linux
gem "ruby_dep", "~> 1.3.1"

group :development, :test do
# debug
gem "tapp"
Expand All @@ -72,7 +75,6 @@ group :development, :test do
gem "awesome_print"
gem 'rack-contrib'
gem 'ruby-prof'
gem 'xray-rails'

gem 'quiet_assets'

Expand Down Expand Up @@ -102,7 +104,7 @@ group :development, :test do
end

# for Login
gem 'devise', '~> 3.5.3'
gem 'devise', '~> 3.5.3'
gem 'pundit'

# pagination
Expand All @@ -127,3 +129,5 @@ gem 'sky_zabbix', '~> 2.2.0'
gem 'nokogiri', '>= 1.6.8'

gem 'rails-html-sanitizer', '~> 1.0.3'

gem 'rubyzip'

0 comments on commit 4c7dcd4

Please sign in to comment.