Skip to content

Commit

Permalink
Fixing issue with env-specific code that needs to be imported only af…
Browse files Browse the repository at this point in the history
…ter the coherence configs.
  • Loading branch information
Vijay Raghavan Aravamudhan committed Nov 10, 2016
1 parent bafe073 commit 8ca0781
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
8 changes: 4 additions & 4 deletions config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ config :ex_admin,
ContactDemo.ExAdmin.Role
]

# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
import_config "#{Mix.env}.exs"

config :contact_demo, ecto_repos: [ContactDemo.Repo]

config :xain, :after_callback, {Phoenix.HTML, :raw}
Expand All @@ -68,3 +64,7 @@ config :coherence, ContactDemo.Coherence.Mailer,
adapter: Swoosh.Adapters.Sendgrid,
api_key: System.get_env("API_KEY")
# %% End Coherence Configuration %%

# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
import_config "#{Mix.env}.exs"
5 changes: 4 additions & 1 deletion config/dev.exs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ config :contact_demo, ContactDemo.Endpoint,
http: [port: 4001],
debug_errors: true,
code_reloader: true,
cache_static_lookup: false,
check_origin: false,
watchers: [node: ["node_modules/brunch/bin/brunch", "watch", "--stdin"]]
watchers: [
node: ["node_modules/brunch/bin/brunch", "watch", "--stdin", cd: Path.expand("../", __DIR__)]
]

# Watch static and templates for browser reloading.
config :contact_demo, ContactDemo.Endpoint,
Expand Down

0 comments on commit 8ca0781

Please sign in to comment.