playground
/
entrydns
mirror of https://github.com/EntryDNS/entrydns.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Merge branch 'master' of bitbucket.org:clyfe/entrydns

pull/1/head
Vaidas Jablonskis 12 years ago
parent
86b1276108 2c7137e536
commit
95137dd088
2 changed files with 112 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      Gemfile
  2. 181
      Gemfile.lock

14
Gemfile
Unescape View File

@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '3.2.8' gem 'rails', '3.2.11'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'
@ -11,8 +11,10 @@ gem 'devise', '~> 2.1.0'
gem 'cancan', '= 1.6.7' gem 'cancan', '= 1.6.7'
gem 'squeel', '~> 1.0.0' gem 'squeel', '~> 1.0.0'
gem 'sentient_model', '~> 1.0.4' gem 'sentient_model', '~> 1.0.4'
gem 'userstamp', '~> 2.0.2', git: 'https://github.com/delynn/userstamp.git' gem 'userstamp', '~> 2.0.2',
gem 'validates_hostname', '~> 1.0.0', git: 'https://github.com/KimNorgaard/validates_hostname.git' git: 'https://github.com/delynn/userstamp.git'
gem 'validates_hostname', '~> 1.0.0',
git: 'https://github.com/KimNorgaard/validates_hostname.git'
gem 'nilify_blanks', '~> 1.0.0' gem 'nilify_blanks', '~> 1.0.0'
gem 'rails_config', '~> 0.2.4' gem 'rails_config', '~> 0.2.4'
gem 'active-model-email-validator', '~> 1.0.2' gem 'active-model-email-validator', '~> 1.0.2'
@ -20,7 +22,10 @@ gem 'mail_form', '~> 1.3.0'
gem 'switch_user', '~> 0.6.0' gem 'switch_user', '~> 0.6.0'
gem 'simple_form', '~> 2.0.0' gem 'simple_form', '~> 2.0.0'
gem 'concerned_with', '~> 0.1.0' gem 'concerned_with', '~> 0.1.0'
gem 'navigasmic', '~> 0.5.6', git: 'https://github.com/jejacks0n/navigasmic.git' gem 'navigasmic', '~> 0.5.6',
git: 'https://github.com/jejacks0n/navigasmic.git',
tag: 'v0.5.6',
ref: '1ffe437f279657c6fb87bb4b0215eb723df4ea7a'
gem 'rails-backbone', '~> 0.7.0' gem 'rails-backbone', '~> 0.7.0'
gem 'acts_as_nested_interval', '~> 0.0.7' gem 'acts_as_nested_interval', '~> 0.0.7'
# path: '/home/clyfe/dev/acts_as_nested_interval' # path: '/home/clyfe/dev/acts_as_nested_interval'
@ -30,6 +35,7 @@ gem 'font-awesome-sass-rails', '~> 2.0.0.0'
gem 'seedbank', '~> 0.1.3' gem 'seedbank', '~> 0.1.3'
gem 'rails_admin', '~> 0.0.5' gem 'rails_admin', '~> 0.0.5'
gem 'rails-settings-cached', '~> 0.2.2' gem 'rails-settings-cached', '~> 0.2.2'
gem 'unicorn', '~> 4.5.0'
# Gems used only for assets and not required # Gems used only for assets and not required
# in production environments by default. # in production environments by default.

181
Gemfile.lock
Unescape View File

@ -13,52 +13,53 @@ GIT
GIT GIT
remote: https://github.com/jejacks0n/navigasmic.git remote: https://github.com/jejacks0n/navigasmic.git
revision: 1ffe437f279657c6fb87bb4b0215eb723df4ea7a revision: 1ffe437f279657c6fb87bb4b0215eb723df4ea7a
ref: 1ffe437f279657c6fb87bb4b0215eb723df4ea7a
tag: v0.5.6
specs: specs:
navigasmic (0.5.6) navigasmic (0.5.6)
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.2.8) actionmailer (3.2.11)
actionpack (= 3.2.8) actionpack (= 3.2.11)
mail (~> 2.4.4) mail (~> 2.4.4)
actionpack (3.2.8) actionpack (3.2.11)
activemodel (= 3.2.8) activemodel (= 3.2.11)
activesupport (= 3.2.8) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.4) journey (~> 1.0.4)
rack (~> 1.4.0) rack (~> 1.4.0)
rack-cache (~> 1.2) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.1.3) sprockets (~> 2.2.1)
active-model-email-validator (1.0.2) active-model-email-validator (1.0.2)
activemodel activemodel
mail mail
active_scaffold (3.2.16) active_scaffold (3.2.19)
rails (>= 3.1.3) rails (>= 3.1.3)
activemodel (3.2.8) activemodel (3.2.11)
activesupport (= 3.2.8) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.8) activerecord (3.2.11)
activemodel (= 3.2.8) activemodel (= 3.2.11)
activesupport (= 3.2.8) activesupport (= 3.2.11)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.2.8) activeresource (3.2.11)
activemodel (= 3.2.8) activemodel (= 3.2.11)
activesupport (= 3.2.8) activesupport (= 3.2.11)
activesupport (3.2.8) activesupport (3.2.11)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
acts_as_nested_interval (0.0.7) acts_as_nested_interval (0.0.10)
rails (~> 3.2.1) rails (~> 3.2.1)
addressable (2.3.2)
arel (3.0.2) arel (3.0.2)
bbenezech-nested_form (0.0.6) bbenezech-nested_form (0.0.6)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
bootstrap-sass (2.1.0.0) bootstrap-sass (2.1.0.1)
builder (3.0.3) builder (3.0.4)
cancan (1.6.7) cancan (1.6.7)
capistrano (2.9.0) capistrano (2.9.0)
highline highline
@ -68,23 +69,24 @@ GEM
net-ssh-gateway (>= 1.1.0) net-ssh-gateway (>= 1.1.0)
capistrano-ext (1.2.1) capistrano-ext (1.2.1)
capistrano (>= 1.0.0) capistrano (>= 1.0.0)
capybara (1.1.2) capybara (1.1.4)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0) selenium-webdriver (~> 2.0)
xpath (~> 0.1.4) xpath (~> 0.1.4)
childprocess (0.3.5) childprocess (0.3.7)
ffi (~> 1.0, >= 1.0.6) ffi (~> 1.0, >= 1.0.6)
chunky_png (1.2.6) chunky_png (1.2.7)
coderay (1.0.8)
coffee-rails (3.2.2) coffee-rails (3.2.2)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (~> 3.2.0) railties (~> 3.2.0)
coffee-script (2.2.0) coffee-script (2.2.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.3.3) coffee-script-source (1.4.0)
compass (0.12.2) compass (0.12.2)
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
@ -95,7 +97,7 @@ GEM
daemons (1.0.10) daemons (1.0.10)
dalli (1.1.5) dalli (1.1.5)
database_cleaner (0.7.2) database_cleaner (0.7.2)
devise (2.1.2) devise (2.1.3)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (~> 3.1) railties (~> 3.1)
@ -113,15 +115,18 @@ GEM
faker (1.0.1) faker (1.0.1)
i18n (~> 0.4) i18n (~> 0.4)
ffi (1.0.11) ffi (1.0.11)
file-tail (1.0.11) file-tail (1.0.12)
tins (~> 0.5.0) tins (~> 0.5)
font-awesome-sass-rails (2.0.0.0) font-awesome-sass-rails (2.0.0.0)
railties (>= 3.1.1) railties (>= 3.1.1)
sass-rails (>= 3.1.1) sass-rails (>= 3.1.1)
fssm (0.2.9) fssm (0.2.10)
gem_plugin (0.2.3) gem_plugin (0.2.3)
guard (1.3.2) guard (1.6.2)
listen (>= 0.4.2) listen (>= 0.6.0)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
terminal-table (>= 1.4.3)
thor (>= 0.14.6) thor (>= 0.14.6)
guard-rspec (0.6.0) guard-rspec (0.6.0)
guard (>= 0.10.0) guard (>= 0.10.0)
@ -129,77 +134,82 @@ GEM
guard (>= 0.10.0) guard (>= 0.10.0)
spork (>= 0.8.4) spork (>= 0.8.4)
haml (3.1.7) haml (3.1.7)
highline (1.6.14) highline (1.6.15)
hike (1.2.1) hike (1.2.1)
i18n (0.6.1) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
jquery-rails (2.1.2) jquery-rails (2.2.0)
railties (>= 3.1.0, < 5.0) railties (>= 3.0, < 5.0)
thor (~> 0.14) thor (>= 0.14, < 2.0)
jquery-ui-rails (1.1.1) jquery-ui-rails (1.1.1)
jquery-rails jquery-rails
railties (>= 3.1.0) railties (>= 3.1.0)
json (1.7.5) json (1.7.6)
kaminari (0.14.1) kaminari (0.14.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
kgio (2.8.0)
libnotify (0.7.4) libnotify (0.7.4)
ffi (~> 1.0.11) ffi (~> 1.0.11)
libv8 (3.3.10.4) libv8 (3.11.8.13)
libwebsocket (0.1.5) listen (0.7.2)
addressable lumberjack (1.0.2)
listen (0.5.0)
mail (2.4.4) mail (2.4.4)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
mail_form (1.3.0) mail_form (1.3.0)
mime-types (1.19) method_source (0.8.1)
mime-types (1.20.1)
mongrel (1.2.0.pre2) mongrel (1.2.0.pre2)
daemons (~> 1.0.10) daemons (~> 1.0.10)
gem_plugin (~> 0.2.3) gem_plugin (~> 0.2.3)
multi_json (1.3.6) multi_json (1.5.0)
mysql2 (0.3.11) mysql2 (0.3.11)
net-scp (1.0.4) net-scp (1.0.4)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
net-sftp (2.0.5) net-sftp (2.0.5)
net-ssh (>= 2.0.9) net-ssh (>= 2.0.9)
net-ssh (2.5.2) net-ssh (2.6.3)
net-ssh-gateway (1.1.0) net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
nilify_blanks (1.0.0) nilify_blanks (1.0.0)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
nokogiri (1.5.5) nokogiri (1.5.6)
orm_adapter (0.4.0) orm_adapter (0.4.0)
polyamorous (0.5.0) polyamorous (0.5.0)
activerecord (~> 3.0) activerecord (~> 3.0)
polyglot (0.3.3) polyglot (0.3.3)
pry (0.9.11.4)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
quiet_assets (1.0.1) quiet_assets (1.0.1)
railties (~> 3.1) railties (~> 3.1)
rack (1.4.1) rack (1.4.4)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-pjax (0.6.0) rack-pjax (0.7.0)
nokogiri (~> 1.5) nokogiri (~> 1.5)
rack (~> 1.3) rack (~> 1.3)
rack-ssl (1.3.2) rack-ssl (1.3.3)
rack rack
rack-test (0.6.1) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (3.2.8) rails (3.2.11)
actionmailer (= 3.2.8) actionmailer (= 3.2.11)
actionpack (= 3.2.8) actionpack (= 3.2.11)
activerecord (= 3.2.8) activerecord (= 3.2.11)
activeresource (= 3.2.8) activeresource (= 3.2.11)
activesupport (= 3.2.8) activesupport (= 3.2.11)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.8) railties (= 3.2.11)
rails-backbone (0.7.2) rails-backbone (0.7.2)
coffee-script (~> 2.2.0) coffee-script (~> 2.2.0)
ejs (~> 1.0.0) ejs (~> 1.0.0)
railties (>= 3.1.0) railties (>= 3.1.0)
rails-settings-cached (0.2.2) rails-settings-cached (0.2.4)
rails (>= 3.0.0) rails (>= 3.0.0)
rails_admin (0.0.5) rails_admin (0.0.5)
bbenezech-nested_form (~> 0.0.6) bbenezech-nested_form (~> 0.0.6)
@ -216,18 +226,20 @@ GEM
sass-rails (~> 3.1) sass-rails (~> 3.1)
rails_config (0.2.7) rails_config (0.2.7)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (3.2.8) railties (3.2.11)
actionpack (= 3.2.8) actionpack (= 3.2.11)
activesupport (= 3.2.8) activesupport (= 3.2.11)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
rake (0.9.2.2) raindrops (0.10.0)
rake (10.0.3)
rb-inotify (0.8.8) rb-inotify (0.8.8)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
ref (1.0.2)
remotipart (1.0.2) remotipart (1.0.2)
rspec (2.10.0) rspec (2.10.0)
rspec-core (~> 2.10.0) rspec-core (~> 2.10.0)
@ -248,59 +260,69 @@ GEM
ruby_parser (2.3.1) ruby_parser (2.3.1)
sexp_processor (~> 3.0) sexp_processor (~> 3.0)
rubyzip (0.9.9) rubyzip (0.9.9)
sass (3.2.1) sass (3.2.5)
sass-rails (3.2.5) sass-rails (3.2.6)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
tilt (~> 1.3) tilt (~> 1.3)
seedbank (0.1.3) seedbank (0.1.3)
selenium-webdriver (2.25.0) selenium-webdriver (2.29.0)
childprocess (>= 0.2.5) childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
websocket (~> 1.0.4)
sentient_model (1.0.4) sentient_model (1.0.4)
bundler (>= 1.0) bundler (>= 1.0)
sexp_processor (3.2.0) sexp_processor (3.2.0)
simple_form (2.0.2) simple_form (2.0.4)
actionpack (~> 3.0) actionpack (~> 3.0)
activemodel (~> 3.0) activemodel (~> 3.0)
simplecov (0.6.4) simplecov (0.7.1)
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.5.3) simplecov-html (~> 0.7.1)
simplecov-html (0.5.3) simplecov-html (0.7.1)
sourcify (0.6.0.rc2) slop (3.4.3)
sourcify (0.6.0.rc3)
file-tail (~> 1.0.10) file-tail (~> 1.0.10)
ruby2ruby (~> 1.3.1) ruby2ruby (~> 1.3.1)
ruby_parser (~> 2.3.1) ruby_parser (~> 2.3.1)
sexp_processor (~> 3.2.0) sexp_processor (~> 3.2.0)
spork (1.0.0rc3) spork (1.0.0rc3)
sprockets (2.1.3) sprockets (2.2.2)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
squeel (1.0.11) squeel (1.0.15)
activerecord (~> 3.0) activerecord (~> 3.0)
activesupport (~> 3.0) activesupport (~> 3.0)
polyamorous (~> 0.5.0) polyamorous (~> 0.5.0)
switch_user (0.6.0) switch_user (0.6.0)
therubyracer (0.10.2) terminal-table (1.4.5)
libv8 (~> 3.3.10) therubyracer (0.11.3)
thor (0.16.0) libv8 (~> 3.11.8.12)
ref
thor (0.17.0)
tilt (1.3.3) tilt (1.3.3)
tins (0.5.4) tins (0.7.0)
treetop (1.4.10) treetop (1.4.12)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
turbolinks (0.5.1) turbolinks (0.5.2)
tzinfo (0.3.33) coffee-rails
tzinfo (0.3.35)
uglifier (1.3.0) uglifier (1.3.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2) multi_json (~> 1.0, >= 1.0.2)
unicorn (4.5.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
warden (1.2.1) warden (1.2.1)
rack (>= 1.0) rack (>= 1.0)
webshims-rails (0.3) webshims-rails (0.4.6)
rails (> 3.1.0) rails (> 3.1.0)
websocket (1.0.7)
xpath (0.1.4) xpath (0.1.4)
nokogiri (~> 1.3) nokogiri (~> 1.3)
@ -335,7 +357,7 @@ DEPENDENCIES
navigasmic (~> 0.5.6)! navigasmic (~> 0.5.6)!
nilify_blanks (~> 1.0.0) nilify_blanks (~> 1.0.0)
quiet_assets (~> 1.0.1) quiet_assets (~> 1.0.1)
rails (= 3.2.8) rails (= 3.2.11)
rails-backbone (~> 0.7.0) rails-backbone (~> 0.7.0)
rails-settings-cached (~> 0.2.2) rails-settings-cached (~> 0.2.2)
rails_admin (~> 0.0.5) rails_admin (~> 0.0.5)
@ -354,6 +376,7 @@ DEPENDENCIES
therubyracer therubyracer
turbolinks (~> 0.5.1) turbolinks (~> 0.5.1)
uglifier (>= 1.0.3) uglifier (>= 1.0.3)
unicorn (~> 4.5.0)
userstamp (~> 2.0.2)! userstamp (~> 2.0.2)!
validates_hostname (~> 1.0.0)! validates_hostname (~> 1.0.0)!
webshims-rails (~> 0.2) webshims-rails (~> 0.2)

Write Preview
Loading…
Cancel
Save