Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#345: updated keys

This commit is contained in:
Vokhmin Alexey V 2014-03-14 01:36:28 +04:00
parent d1ea49c680
commit 331944e0fd
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/activity_feed.rb
View File

@ -1,9 +1,9 @@
class ActivityFeed < ActiveRecord::Base class ActivityFeed < ActiveRecord::Base
CODE = ['git_delete_branch_notification', 'git_new_push_notification', 'new_comment_commit_notification'] CODE = %w(git_delete_branch_notification git_new_push_notification new_comment_commit_notification)
TRACKER = ['issue_assign_notification', 'new_comment_notification', 'new_issue_notification'] TRACKER = %w(issue_assign_notification new_comment_notification new_issue_notification)
BUILD = ['build_list_notification'] BUILD = %w(build_list_notification)
WIKI = ['wiki_new_commit_notification'] WIKI = %w(wiki_new_commit_notification)
belongs_to :user belongs_to :user
serialize :data serialize :data

4
config/application.yml.sample
View File

@ -16,8 +16,10 @@ common: &common
key_pair_secret_key: 'key_pair_secret_key' key_pair_secret_key: 'key_pair_secret_key'
airbrake_api_key: 'airbrake_api_key' airbrake_api_key: 'airbrake_api_key'
logentries_key: 'logentries_key' logentries_key: 'logentries_key'
devise_pepper: 'devise_pepper'
secret_token: 'secret_token' secret_token: 'secret_token'
devise:
pepper: 'devise_pepper'
secret: 'devise_secret'
github: github:
id: 'APP_ID' id: 'APP_ID'
secret: 'APP_SECRET' secret: 'APP_SECRET'

3
config/application.yml.travis
View File

@ -17,6 +17,9 @@ common: &common
airbrake_api_key: 'airbrake_api_key' airbrake_api_key: 'airbrake_api_key'
devise_pepper: 'e295a79fb7966e94a6e8b184ba65791a' devise_pepper: 'e295a79fb7966e94a6e8b184ba65791a'
secret_token: 'e295a79fb7966e94a6e8b184ba65791a' secret_token: 'e295a79fb7966e94a6e8b184ba65791a'
devise:
pepper: 'e295a79fb7966e94a6e8b184ba65791a'
secret: '82e10b58b3f4a764f551fb104aa76808f539380f82da75d3f29edfc09ed9c3a153c22ceacc87890a9b19d0ad89bb6484481f4e021e0ecf942d80c34d930829e9'
github: github:
id: 'APP_ID' id: 'APP_ID'
secret: 'APP_SECRET' secret: 'APP_SECRET'

4
config/initializers/devise.rb
View File

@ -69,7 +69,7 @@ Devise.setup do |config|
config.stretches = Rails.env.test? ? 1 : 10 config.stretches = Rails.env.test? ? 1 : 10
# Setup a pepper to generate the encrypted password. # Setup a pepper to generate the encrypted password.
config.pepper = APP_CONFIG['keys']['devise_pepper'] config.pepper = APP_CONFIG['keys']['devise']['pepper']
# ==> Configuration for :confirmable # ==> Configuration for :confirmable
# A period that the user is allowed to access the website even without # A period that the user is allowed to access the website even without
@ -205,5 +205,5 @@ Devise.setup do |config|
# manager.default_strategies(:scope => :user).unshift :some_external_strategy # manager.default_strategies(:scope => :user).unshift :some_external_strategy
# end # end
config.secret_key = APP_CONFIG['keys']['devise_secret'] config.secret_key = APP_CONFIG['keys']['devise']['secret']
end end