Admin interface #6

Merged
ignisf merged 23 commits from admin-interface into master 2014-10-06 12:33:26 +03:00
2 changed files with 63 additions and 66 deletions
Showing only changes of commit b726460d65 - Show all commits

View File

@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '4.1.5' gem 'rails', '4.1.6'
gem 'sqlite3' gem 'sqlite3'
gem 'pg' gem 'pg'

View File

@ -10,27 +10,27 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.5) actionmailer (4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
mail (~> 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.5) actionpack (4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.5) actionview (4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.5) activemodel (4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.5) activerecord (4.1.6)
activemodel (= 4.1.5) activemodel (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
arel (~> 5.0.0) arel (~> 5.0.0)
activesupport (4.1.5) activesupport (4.1.6)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -51,10 +51,10 @@ GEM
i18n i18n
rake (>= 10.0.0) rake (>= 10.0.0)
sshkit (~> 1.3) sshkit (~> 1.3)
capistrano-bundler (1.1.2) capistrano-bundler (1.1.3)
capistrano (~> 3.0) capistrano (~> 3.1)
sshkit (~> 1.2) sshkit (~> 1.2)
capistrano-rails (1.1.1) capistrano-rails (1.1.2)
capistrano (~> 3.1) capistrano (~> 3.1)
capistrano-bundler (~> 1.1) capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.1) capistrano-rvm (0.1.1)
@ -71,8 +71,8 @@ GEM
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
json (>= 1.7) json (>= 1.7)
mime-types (>= 1.16) mime-types (>= 1.16)
celluloid (0.15.2) celluloid (0.16.0)
timers (~> 1.1.0) timers (~> 4.0.0)
choice (0.1.6) choice (0.1.6)
coderay (1.1.0) coderay (1.1.0)
coffee-rails (4.0.1) coffee-rails (4.0.1)
@ -92,7 +92,7 @@ GEM
railties (>= 3.2.6, < 5) railties (>= 3.2.6, < 5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
devise-i18n (0.11.0) devise-i18n (0.11.1)
diff-lcs (1.2.5) diff-lcs (1.2.5)
erubis (2.7.0) erubis (2.7.0)
execjs (2.2.1) execjs (2.2.1)
@ -120,22 +120,22 @@ GEM
guard (~> 2.1) guard (~> 2.1)
rspec (>= 2.14, < 4.0) rspec (>= 2.14, < 4.0)
hike (1.2.3) hike (1.2.3)
hitimes (1.2.2)
i18n (0.6.11) i18n (0.6.11)
jquery-rails (3.1.1) jquery-rails (3.1.2)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.1)
libv8 (3.16.14.3) libv8 (3.16.14.7)
listen (2.7.9) listen (2.7.9)
celluloid (>= 0.15.2) celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
lumberjack (1.0.9) lumberjack (1.0.9)
mail (2.5.4) mail (2.6.1)
mime-types (~> 1.16) mime-types (>= 1.16, < 3)
treetop (~> 1.4.8)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (2.3)
mini_portile (0.6.0) mini_portile (0.6.0)
minitest (5.4.1) minitest (5.4.1)
multi_json (1.10.1) multi_json (1.10.1)
@ -146,42 +146,41 @@ GEM
mini_portile (= 0.6.0) mini_portile (= 0.6.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
pg (0.17.1) pg (0.17.1)
phony (2.2.15) phony (2.3.0)
phony_rails (0.6.2) phony_rails (0.6.2)
activesupport (>= 3.0) activesupport (>= 3.0)
countries (>= 0.8.2) countries (>= 0.8.2)
phony (~> 2.1) phony (~> 2.1)
polyglot (0.3.5)
pry (0.10.1) pry (0.10.1)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
puma (2.9.0) puma (2.9.1)
rack (>= 1.1, < 2.0) rack (>= 1.1, < 2.0)
rack (1.5.2) rack (1.5.2)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.5) rails (4.1.6)
actionmailer (= 4.1.5) actionmailer (= 4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
activemodel (= 4.1.5) activemodel (= 4.1.6)
activerecord (= 4.1.5) activerecord (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.5) railties (= 4.1.6)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
rails-erd (1.1.0) rails-erd (1.1.0)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
choice (~> 0.1.6) choice (~> 0.1.6)
ruby-graphviz (~> 1.0.4) ruby-graphviz (~> 1.0.4)
rails-i18n (4.0.2) rails-i18n (4.0.3)
i18n (~> 0.6) i18n (~> 0.6)
rails (>= 4.0) railties (~> 4.0)
railties (4.1.5) railties (4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.2) rake (10.3.2)
@ -190,26 +189,26 @@ GEM
ffi (>= 0.5.0) ffi (>= 0.5.0)
ref (1.0.5) ref (1.0.5)
rmagick (2.13.3) rmagick (2.13.3)
rspec (3.0.0) rspec (3.1.0)
rspec-core (~> 3.0.0) rspec-core (~> 3.1.0)
rspec-expectations (~> 3.0.0) rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.0.0) rspec-mocks (~> 3.1.0)
rspec-core (3.0.4) rspec-core (3.1.4)
rspec-support (~> 3.0.0) rspec-support (~> 3.1.0)
rspec-expectations (3.0.4) rspec-expectations (3.1.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0) rspec-support (~> 3.1.0)
rspec-mocks (3.0.4) rspec-mocks (3.1.1)
rspec-support (~> 3.0.0) rspec-support (~> 3.1.0)
rspec-rails (3.0.2) rspec-rails (3.1.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec-core (~> 3.0.0) rspec-core (~> 3.1.0)
rspec-expectations (~> 3.0.0) rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.0.0) rspec-mocks (~> 3.1.0)
rspec-support (~> 3.0.0) rspec-support (~> 3.1.0)
rspec-support (3.0.4) rspec-support (3.1.0)
ruby-graphviz (1.0.9) ruby-graphviz (1.0.9)
sass (3.2.19) sass (3.2.19)
sass-rails (4.0.3) sass-rails (4.0.3)
@ -237,7 +236,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.3) sprockets-rails (2.1.4)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (~> 2.8)
@ -253,10 +252,8 @@ GEM
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
timers (1.1.0) timers (4.0.1)
treetop (1.4.15) hitimes
polyglot
polyglot (>= 0.3.1)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.3) uglifier (2.5.3)
@ -292,7 +289,7 @@ DEPENDENCIES
pg pg
phony_rails phony_rails
puma puma
rails (= 4.1.5) rails (= 4.1.6)
rails-erd rails-erd
rails-i18n rails-i18n
rmagick rmagick