rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-17 11:54:22 +01:00
Code Issues Releases Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
cyril 2016-05-03 09:41:26 +02:00
commit 0859e42db7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/controllers/profile.coffee
View File

@ -1,8 +1,8 @@
'use strict' 'use strict'
Application.Controllers.controller "CompleteProfileController", ["$scope", "$rootScope", "$state", "_t", "growl", "CSRF", "Auth", "Member", "settingsPromise", "activeProviderPromise", "groupsPromise", "cguFile", "memberPromise", "Session" Application.Controllers.controller "CompleteProfileController", ["$scope", "$rootScope", "$state", "$window", "_t", "growl", "CSRF", "Auth", "Member", "settingsPromise", "activeProviderPromise", "groupsPromise", "cguFile", "memberPromise", "Session"
, ($scope, $rootScope, $state, _t, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise, Session) -> , ($scope, $rootScope, $state, $window, _t, growl, CSRF, Auth, Member, settingsPromise, activeProviderPromise, groupsPromise, cguFile, memberPromise, Session) ->

3
config/initializers/openlab_ruby.rb
View File

@ -1,3 +1,6 @@
Openlab.configure do |config| Openlab.configure do |config|
config.app_secret = Rails.application.secrets.openlab_app_secret config.app_secret = Rails.application.secrets.openlab_app_secret
if !Rails.env.production?
config.base_uri = Rails.application.secrets.openlab_base_uri
end
end end