Skip to content

Commit 8246f01

Browse files
authored
Merge pull request #326 from zendesk/olaf/fix_zat_staging
Update REGEX for staging
2 parents c1a9780 + fabf53f commit 8246f01

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
zendesk_apps_tools (3.5.0)
4+
zendesk_apps_tools (3.5.1)
55
execjs (~> 2.7.0)
66
faraday (~> 0.9.2)
77
faye-websocket (~> 0.10.7)

lib/zendesk_apps_tools/server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Server < Sinatra::Base
88
set :server, :thin
99
set :logging, true
1010
set :protection, except: :frame_options
11-
ZENDESK_DOMAINS_REGEX = %r{^http(?:s)?://[a-z0-9-]+\.(?:zendesk|zopim|zd-(?:dev|master|staging))\.com$}
11+
ZENDESK_DOMAINS_REGEX = %r{^http(?:s)?://[a-z0-9-]+\.(?:zendesk|zopim|zendesk-(?:dev|master|staging))\.com$}
1212

1313
get '/app.js' do
1414
serve_installed_js

0 commit comments

Comments
 (0)