Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
e5a7ed3a
Commit
e5a7ed3a
authored
May 05, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Review changes
parent
12fbce2e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
7 deletions
+3
-7
app/assets/javascripts/raven/index.js
app/assets/javascripts/raven/index.js
+1
-1
lib/gitlab/gon_helper.rb
lib/gitlab/gon_helper.rb
+0
-1
spec/javascripts/raven/index_spec.js
spec/javascripts/raven/index_spec.js
+2
-1
spec/javascripts/raven/raven_config_spec.js
spec/javascripts/raven/raven_config_spec.js
+0
-4
No files found.
app/assets/javascripts/raven/index.js
View file @
e5a7ed3a
...
@@ -5,7 +5,7 @@ const index = function index() {
...
@@ -5,7 +5,7 @@ const index = function index() {
sentryDsn
:
gon
.
sentry_dsn
,
sentryDsn
:
gon
.
sentry_dsn
,
currentUserId
:
gon
.
current_user_id
,
currentUserId
:
gon
.
current_user_id
,
whitelistUrls
:
[
gon
.
gitlab_url
],
whitelistUrls
:
[
gon
.
gitlab_url
],
isProduction
:
gon
.
is_production
,
isProduction
:
process
.
env
.
NODE_ENV
,
});
});
return
RavenConfig
;
return
RavenConfig
;
...
...
lib/gitlab/gon_helper.rb
View file @
e5a7ed3a
...
@@ -12,7 +12,6 @@ module Gitlab
...
@@ -12,7 +12,6 @@ module Gitlab
gon
.
katex_js_url
=
ActionController
::
Base
.
helpers
.
asset_path
(
'katex.js'
)
gon
.
katex_js_url
=
ActionController
::
Base
.
helpers
.
asset_path
(
'katex.js'
)
gon
.
sentry_dsn
=
current_application_settings
.
clientside_sentry_dsn
if
current_application_settings
.
clientside_sentry_enabled
gon
.
sentry_dsn
=
current_application_settings
.
clientside_sentry_dsn
if
current_application_settings
.
clientside_sentry_enabled
gon
.
gitlab_url
=
Gitlab
.
config
.
gitlab
.
url
gon
.
gitlab_url
=
Gitlab
.
config
.
gitlab
.
url
gon
.
is_production
=
Rails
.
env
.
production?
if
current_user
if
current_user
gon
.
current_user_id
=
current_user
.
id
gon
.
current_user_id
=
current_user
.
id
...
...
spec/javascripts/raven/index_spec.js
View file @
e5a7ed3a
...
@@ -18,9 +18,10 @@ describe('RavenConfig options', () => {
...
@@ -18,9 +18,10 @@ describe('RavenConfig options', () => {
sentry_dsn
:
sentryDsn
,
sentry_dsn
:
sentryDsn
,
current_user_id
:
currentUserId
,
current_user_id
:
currentUserId
,
gitlab_url
:
gitlabUrl
,
gitlab_url
:
gitlabUrl
,
is_production
:
isProduction
,
};
};
process
.
env
.
NODE_ENV
=
isProduction
;
spyOn
(
RavenConfig
,
'
init
'
);
spyOn
(
RavenConfig
,
'
init
'
);
indexReturnValue
=
index
();
indexReturnValue
=
index
();
...
...
spec/javascripts/raven/raven_config_spec.js
View file @
e5a7ed3a
...
@@ -157,10 +157,6 @@ describe('RavenConfig', () => {
...
@@ -157,10 +157,6 @@ describe('RavenConfig', () => {
RavenConfig
.
bindRavenErrors
();
RavenConfig
.
bindRavenErrors
();
});
});
it
(
'
should query for document using jquery
'
,
()
=>
{
expect
(
window
.
$
).
toHaveBeenCalledWith
(
document
);
});
it
(
'
should call .on
'
,
function
()
{
it
(
'
should call .on
'
,
function
()
{
expect
(
$document
.
on
).
toHaveBeenCalledWith
(
'
ajaxError.raven
'
,
RavenConfig
.
handleRavenErrors
);
expect
(
$document
.
on
).
toHaveBeenCalledWith
(
'
ajaxError.raven
'
,
RavenConfig
.
handleRavenErrors
);
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment