zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-25 20:18:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'staging' into alpha

Browse source
This commit is contained in:
Priit Tark 2015-06-25 11:07:59 +03:00
commit ff0195b125
3 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -24,7 +24,7 @@
29.05.2015 29.05.2015
* Removed old 'iptables_counter_update_command' and added 'iptables_counter_enabled', please enable it. * Removed old 'iptables_counter_update_command' and added 'iptables_counter_enabled'
26.05.2015 26.05.2015

22
Gemfile.lock
View file

@ -87,7 +87,7 @@ GEM
actionpack actionpack
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
rspec rspec
autoprefixer-rails (5.2.0) autoprefixer-rails (5.2.0.1)
execjs execjs
json json
axiom-types (0.1.1) axiom-types (0.1.1)
@ -235,7 +235,7 @@ GEM
hpricot (0.8.6) hpricot (0.8.6)
html5_validators (1.2.0) html5_validators (1.2.0)
httpclient (2.6.0.1) httpclient (2.6.0.1)
httpi (2.4.0) httpi (2.4.1)
rack rack
i18n (0.7.0) i18n (0.7.0)
ice_nine (0.11.1) ice_nine (0.11.1)
@ -244,7 +244,7 @@ GEM
jbuilder (2.2.16) jbuilder (2.2.16)
activesupport (>= 3.0.0, < 5) activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2) multi_json (~> 1.2)
jquery-rails (4.0.3) jquery-rails (4.0.4)
rails-dom-testing (~> 1.0) rails-dom-testing (~> 1.0)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
@ -262,15 +262,13 @@ GEM
addressable (~> 2.3) addressable (~> 2.3)
libv8 (3.16.14.7) libv8 (3.16.14.7)
libxml-ruby (2.8.0) libxml-ruby (2.8.0)
listen (2.10.0) listen (2.10.1)
celluloid (~> 0.16.0) celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
loofah (2.0.2) loofah (2.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lumberjack (1.0.9) lumberjack (1.0.9)
macaddr (1.7.1)
systemu (~> 2.6.2)
mail (2.6.3) mail (2.6.3)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
method_source (0.8.2) method_source (0.8.2)
@ -289,7 +287,7 @@ GEM
monetize (~> 1.1.0) monetize (~> 1.1.0)
money (~> 6.5.0) money (~> 6.5.0)
railties (>= 3.0) railties (>= 3.0)
multi_json (1.11.0) multi_json (1.11.1)
multi_xml (0.5.5) multi_xml (0.5.5)
newrelic_rpm (3.9.9.275) newrelic_rpm (3.9.9.275)
nokogiri (1.6.6.2) nokogiri (1.6.6.2)
@ -298,7 +296,7 @@ GEM
nprogress-rails (0.1.6.7) nprogress-rails (0.1.6.7)
open4 (1.3.4) open4 (1.3.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parser (2.2.2.5) parser (2.3.0.pre.2)
ast (>= 1.1, < 3.0) ast (>= 1.1, < 3.0)
pdfkit (0.6.2) pdfkit (0.6.2)
pg (0.18.2) pg (0.18.2)
@ -322,7 +320,7 @@ GEM
erubis erubis
que (~> 0.8) que (~> 0.8)
sinatra sinatra
rack (1.6.1) rack (1.6.4)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
rack-mount (0.8.3) rack-mount (0.8.3)
@ -427,14 +425,13 @@ GEM
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1) tilt (~> 1.1)
savon (2.11.0) savon (2.11.1)
akami (~> 1.2) akami (~> 1.2)
builder (>= 2.1.2) builder (>= 2.1.2)
gyoku (~> 1.2) gyoku (~> 1.2)
httpi (~> 2.3) httpi (~> 2.3)
nokogiri (>= 1.4.0) nokogiri (>= 1.4.0)
nori (~> 2.4) nori (~> 2.4)
uuid (~> 2.3.7)
wasabi (~> 3.4) wasabi (~> 3.4)
sdoc (0.4.1) sdoc (0.4.1)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
@ -470,7 +467,6 @@ GEM
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sys-uname (0.9.0) sys-uname (0.9.0)
ffi (>= 1.0.0) ffi (>= 1.0.0)
systemu (2.6.5)
temple (0.6.10) temple (0.6.10)
terminal-table (1.4.5) terminal-table (1.4.5)
therubyracer (0.12.2) therubyracer (0.12.2)
@ -495,8 +491,6 @@ GEM
rack rack
raindrops (~> 0.7) raindrops (~> 0.7)
uniform_notifier (1.9.0) uniform_notifier (1.9.0)
uuid (2.3.8)
macaddr (~> 1.0)
uuidtools (2.1.5) uuidtools (2.1.5)
virtus (1.0.5) virtus (1.0.5)
axiom-types (~> 0.1) axiom-types (~> 0.1)

1
config/application-example.yml
View file

@ -10,7 +10,6 @@ time_zone: 'Tallinn' # more zones by rake time:zones:all
# Example: 'Admin, EPP, REPP' will have name 'Admin, EPP, REPP - production' at New Relic. # Example: 'Admin, EPP, REPP' will have name 'Admin, EPP, REPP - production' at New Relic.
new_relic_app_name: 'Admin, EPP, REPP, Registrar, Registrant' new_relic_app_name: 'Admin, EPP, REPP, Registrar, Registrant'
# You can use `rake secret` to generate a secure secret key. # You can use `rake secret` to generate a secure secret key.
# Your secret key is used for verifying the integrity of signed cookies. # Your secret key is used for verifying the integrity of signed cookies.
# If you change this key, all old signed cookies will become invalid! # If you change this key, all old signed cookies will become invalid!