summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorazul <azul@leap.se>2014-07-09 13:25:31 +0200
committerazul <azul@leap.se>2014-07-09 13:25:31 +0200
commitdc740e4311101bf7297996788b25a99edafbe759 (patch)
treed989456179551fb167f6c41ba4b54bbd4a77a7ac /config
parent19da5429308412c19176733d2b32ccbf2c08df1c (diff)
parent0cc11ebb609de225fbeacbf80788b992b88b6ce6 (diff)
Merge pull request #173 from azul/feature/unblock-handles
Allow admins to unblock handles
Diffstat (limited to 'config')
-rw-r--r--config/initializers/braintree.rb26
-rw-r--r--config/locales/users.en.yml7
-rw-r--r--config/routes.rb2
3 files changed, 33 insertions, 2 deletions
diff --git a/config/initializers/braintree.rb b/config/initializers/braintree.rb
new file mode 100644
index 0000000..1eeb393
--- /dev/null
+++ b/config/initializers/braintree.rb
@@ -0,0 +1,26 @@
+if defined? Braintree
+
+ #
+ # set logger
+ #
+ if APP_CONFIG[:logfile].blank?
+ require 'syslog/logger'
+ Braintree::Configuration.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new('webapp'))
+ else
+ Braintree::Configuration.logger = Logger.new('log/braintree.log')
+ end
+
+ #
+ # You can set these per environment in config/config.yml:
+ #
+ # Environment must be one of: :development, :qa, :sandbox, :production
+ #
+ if billing = APP_CONFIG[:billing]
+ if braintree = billing[:braintree]
+ Braintree::Configuration.environment = braintree[:environment].downcase.to_sym
+ Braintree::Configuration.merchant_id = braintree[:merchant_id]
+ Braintree::Configuration.public_key = braintree[:public_key]
+ Braintree::Configuration.private_key = braintree[:private_key]
+ end
+ end
+end
diff --git a/config/locales/users.en.yml b/config/locales/users.en.yml
index f0fcb3d..bebf1cf 100644
--- a/config/locales/users.en.yml
+++ b/config/locales/users.en.yml
@@ -1,6 +1,9 @@
en:
- layouts:
- users: "Users"
+ common:
+ navigation_item:
+ users: "Users"
+ identities: "Usernames"
+ tickets: "Tickets"
user_control_panel: "user control panel"
account_settings: "Account Settings"
username: "Username"
diff --git a/config/routes.rb b/config/routes.rb
index 4ccfe62..468e14e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,6 +48,8 @@ LeapWeb::Application.routes.draw do
post 'deactivate', on: :member
post 'enable', on: :member
end
+
+ resources :identities, :only => [:index, :destroy]
end
get "/.well-known/host-meta" => 'webfinger#host_meta'