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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2a86ea2b
Commit
2a86ea2b
authored
Jun 22, 2021
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove type = 'alert' from createFlash
Already matches the default params
parent
fd485099
Changes
27
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
1 addition
and
42 deletions
+1
-42
app/assets/javascripts/error_tracking_settings/store/actions.js
...sets/javascripts/error_tracking_settings/store/actions.js
+0
-1
app/assets/javascripts/grafana_integration/store/actions.js
app/assets/javascripts/grafana_integration/store/actions.js
+0
-1
app/assets/javascripts/ide/components/new_dropdown/modal.vue
app/assets/javascripts/ide/components/new_dropdown/modal.vue
+0
-1
app/assets/javascripts/ide/components/repo_editor.vue
app/assets/javascripts/ide/components/repo_editor.vue
+0
-1
app/assets/javascripts/ide/ide_router.js
app/assets/javascripts/ide/ide_router.js
+0
-1
app/assets/javascripts/ide/stores/actions.js
app/assets/javascripts/ide/stores/actions.js
+0
-3
app/assets/javascripts/ide/stores/actions/merge_request.js
app/assets/javascripts/ide/stores/actions/merge_request.js
+0
-1
app/assets/javascripts/ide/stores/actions/project.js
app/assets/javascripts/ide/stores/actions/project.js
+0
-2
app/assets/javascripts/ide/stores/modules/commit/actions.js
app/assets/javascripts/ide/stores/modules/commit/actions.js
+0
-1
app/assets/javascripts/incidents_settings/incidents_settings_service.js
...ascripts/incidents_settings/incidents_settings_service.js
+0
-1
app/assets/javascripts/notes.js
app/assets/javascripts/notes.js
+0
-1
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+0
-1
app/assets/javascripts/notes/components/noteable_note.vue
app/assets/javascripts/notes/components/noteable_note.vue
+0
-1
app/assets/javascripts/notes/mixins/resolvable.js
app/assets/javascripts/notes/mixins/resolvable.js
+0
-1
app/assets/javascripts/notes/stores/actions.js
app/assets/javascripts/notes/stores/actions.js
+0
-4
app/assets/javascripts/operation_settings/store/actions.js
app/assets/javascripts/operation_settings/store/actions.js
+0
-1
app/assets/javascripts/task_list.js
app/assets/javascripts/task_list.js
+0
-1
app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
...avascripts/vue_shared/components/markdown/suggestions.vue
+0
-1
ee/app/assets/javascripts/related_items_tree/components/create_issue_form.vue
...ripts/related_items_tree/components/create_issue_form.vue
+1
-2
ee/app/assets/javascripts/security_dashboard/store/modules/vulnerabilities/actions.js
...curity_dashboard/store/modules/vulnerabilities/actions.js
+0
-5
ee/app/assets/javascripts/status_page_settings/store/actions.js
.../assets/javascripts/status_page_settings/store/actions.js
+0
-1
ee/spec/frontend/status_page_settings/store/actions_spec.js
ee/spec/frontend/status_page_settings/store/actions_spec.js
+0
-1
spec/frontend/grafana_integration/components/grafana_integration_spec.js
...rafana_integration/components/grafana_integration_spec.js
+0
-1
spec/frontend/ide/components/new_dropdown/modal_spec.js
spec/frontend/ide/components/new_dropdown/modal_spec.js
+0
-1
spec/frontend/incidents_settings/components/incidents_settings_service_spec.js
...ts_settings/components/incidents_settings_service_spec.js
+0
-1
spec/frontend/notes/stores/actions_spec.js
spec/frontend/notes/stores/actions_spec.js
+0
-5
spec/frontend/operation_settings/components/metrics_settings_spec.js
...nd/operation_settings/components/metrics_settings_spec.js
+0
-1
No files found.
app/assets/javascripts/error_tracking_settings/store/actions.js
View file @
2a86ea2b
...
...
@@ -48,7 +48,6 @@ export const receiveSettingsError = ({ commit }, { response = {} }) => {
createFlash
({
message
:
`
${
__
(
'
There was an error saving your changes.
'
)}
${
message
}
`
,
type
:
'
alert
'
,
});
commit
(
types
.
UPDATE_SETTINGS_LOADING
,
false
);
};
...
...
app/assets/javascripts/grafana_integration/store/actions.js
View file @
2a86ea2b
...
...
@@ -40,6 +40,5 @@ export const receiveGrafanaIntegrationUpdateError = (_, error) => {
createFlash
({
message
:
`
${
__
(
'
There was an error saving your changes.
'
)}
${
message
}
`
,
type
:
'
alert
'
,
});
};
app/assets/javascripts/ide/components/new_dropdown/modal.vue
View file @
2a86ea2b
...
...
@@ -61,7 +61,6 @@ export default {
message
:
sprintf
(
s__
(
'
The name "%{name}" is already taken in this directory.
'
),
{
name
:
this
.
entryName
,
}),
type
:
'
alert
'
,
fadeTransition
:
false
,
addBodyClass
:
true
,
});
...
...
app/assets/javascripts/ide/components/repo_editor.vue
View file @
2a86ea2b
...
...
@@ -252,7 +252,6 @@ export default {
.
catch
((
err
)
=>
{
createFlash
({
message
:
__
(
'
Error setting up editor. Please try again.
'
),
type
:
'
alert
'
,
fadeTransition
:
false
,
addBodyClass
:
true
,
});
...
...
app/assets/javascripts/ide/ide_router.js
View file @
2a86ea2b
...
...
@@ -113,7 +113,6 @@ export const createRouter = (store, defaultBranch) => {
.
catch
((
e
)
=>
{
createFlash
({
message
:
__
(
'
Error while loading the project data. Please try again.
'
),
type
:
'
alert
'
,
fadeTransition
:
false
,
addBodyClass
:
true
,
});
...
...
app/assets/javascripts/ide/stores/actions.js
View file @
2a86ea2b
...
...
@@ -40,8 +40,6 @@ export const createTempEntry = (
message
:
sprintf
(
__
(
'
The name "%{name}" is already taken in this directory.
'
),
{
name
:
name
.
split
(
'
/
'
).
pop
(),
}),
type
:
'
alert
'
,
fadeTransition
:
false
,
addBodyClass
:
true
,
});
...
...
@@ -285,7 +283,6 @@ export const getBranchData = ({ commit, state }, { projectId, branchId, force =
}
else
{
createFlash
({
message
:
__
(
'
Error loading branch data. Please try again.
'
),
type
:
'
alert
'
,
fadeTransition
:
false
,
addBodyClass
:
true
,
});
...
...
app/assets/javascripts/ide/stores/actions/merge_request.js
View file @
2a86ea2b
...
...
@@ -36,7 +36,6 @@ export const getMergeRequestsForBranch = (
.
catch
((
e
)
=>
{
createFlash
({
message
:
__
(
`Error fetching merge requests for
${
branchId
}
`
),
type
:
'
alert
'
,
fadeTransition
:
false
,
addBodyClass
:
true
,
});
...
...
app/assets/javascripts/ide/stores/actions/project.js
View file @
2a86ea2b
...
...
@@ -21,7 +21,6 @@ export const getProjectData = ({ commit, state }, { namespace, projectId, force
.
catch
(()
=>
{
createFlash
({
message
:
__
(
'
Error loading project data. Please try again.
'
),
type
:
'
alert
'
,
fadeTransition
:
false
,
addBodyClass
:
true
,
});
...
...
@@ -45,7 +44,6 @@ export const refreshLastCommitData = ({ commit }, { projectId, branchId } = {})
.
catch
((
e
)
=>
{
createFlash
({
message
:
__
(
'
Error loading last commit.
'
),
type
:
'
alert
'
,
fadeTransition
:
false
,
addBodyClass
:
true
,
});
...
...
app/assets/javascripts/ide/stores/modules/commit/actions.js
View file @
2a86ea2b
...
...
@@ -145,7 +145,6 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo
if
(
!
data
.
short_id
)
{
createFlash
({
message
:
data
.
message
,
type
:
'
alert
'
,
fadeTransition
:
false
,
addBodyClass
:
true
,
});
...
...
app/assets/javascripts/incidents_settings/incidents_settings_service.js
View file @
2a86ea2b
...
...
@@ -24,7 +24,6 @@ export default class IncidentsSettingsService {
createFlash
({
message
:
`
${
ERROR_MSG
}
${
message
}
`
,
type
:
'
alert
'
,
});
});
}
...
...
app/assets/javascripts/notes.js
View file @
2a86ea2b
...
...
@@ -628,7 +628,6 @@ export default class Notes {
message
:
__
(
'
Your comment could not be submitted! Please check your network connection and try again.
'
,
),
type
:
'
alert
'
,
parent
:
formParentTimeline
.
get
(
0
),
});
}
...
...
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @
2a86ea2b
...
...
@@ -222,7 +222,6 @@ export default {
);
createFlash
({
message
:
msg
,
type
:
'
alert
'
,
parent
:
this
.
$el
,
});
this
.
$refs
.
noteForm
.
note
=
noteText
;
...
...
app/assets/javascripts/notes/components/noteable_note.vue
View file @
2a86ea2b
...
...
@@ -320,7 +320,6 @@ export default {
const
msg
=
__
(
'
Something went wrong while editing your comment. Please try again.
'
);
createFlash
({
message
:
msg
,
type
:
'
alert
'
,
parent
:
this
.
$el
,
});
this
.
recoverNoteContent
(
noteText
);
...
...
app/assets/javascripts/notes/mixins/resolvable.js
View file @
2a86ea2b
...
...
@@ -48,7 +48,6 @@ export default {
const
msg
=
__
(
'
Something went wrong while resolving this discussion. Please try again.
'
);
createFlash
({
message
:
msg
,
type
:
'
alert
'
,
parent
:
this
.
$el
,
});
});
...
...
app/assets/javascripts/notes/stores/actions.js
View file @
2a86ea2b
...
...
@@ -381,7 +381,6 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
.
catch
(()
=>
{
createFlash
({
message
:
__
(
'
Something went wrong while adding your award. Please try again.
'
),
type
:
'
alert
'
,
parent
:
noteData
.
flashContainer
,
});
})
...
...
@@ -423,7 +422,6 @@ export const saveNote = ({ commit, dispatch }, noteData) => {
});
createFlash
({
message
:
errorMsg
,
type
:
'
alert
'
,
parent
:
noteData
.
flashContainer
,
});
return
{
...
data
,
hasFlash
:
true
};
...
...
@@ -627,7 +625,6 @@ export const submitSuggestion = (
createFlash
({
message
:
__
(
flashMessage
),
type
:
'
alert
'
,
parent
:
flashContainer
,
});
})
...
...
@@ -664,7 +661,6 @@ export const submitSuggestionBatch = ({ commit, dispatch, state }, { flashContai
createFlash
({
message
:
__
(
flashMessage
),
type
:
'
alert
'
,
parent
:
flashContainer
,
});
})
...
...
app/assets/javascripts/operation_settings/store/actions.js
View file @
2a86ea2b
...
...
@@ -37,6 +37,5 @@ export const receiveSaveChangesError = (_, error) => {
createFlash
({
message
:
`
${
__
(
'
There was an error saving your changes.
'
)}
${
message
}
`
,
type
:
'
alert
'
,
});
};
app/assets/javascripts/task_list.js
View file @
2a86ea2b
...
...
@@ -24,7 +24,6 @@ export default class TaskList {
return
createFlash
({
message
:
errorMessages
||
__
(
'
Update failed
'
),
type
:
'
alert
'
,
});
};
...
...
app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
View file @
2a86ea2b
...
...
@@ -81,7 +81,6 @@ export default {
if
(
this
.
lineType
===
'
old
'
)
{
createFlash
({
message
:
__
(
'
Unable to apply suggestions to a deleted line.
'
),
type
:
'
alert
'
,
parent
:
this
.
$el
,
});
}
...
...
ee/app/assets/javascripts/related_items_tree/components/create_issue_form.vue
View file @
2a86ea2b
...
...
@@ -14,7 +14,7 @@ import { debounce } from 'lodash';
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
Api
from
'
~/api
'
;
import
createFlash
,
{
FLASH_TYPES
}
from
'
~/flash
'
;
import
createFlash
from
'
~/flash
'
;
import
{
STORAGE_KEY
}
from
'
~/frequent_items/constants
'
;
import
{
getTopFrequentItems
}
from
'
~/frequent_items/utils
'
;
import
AccessorUtilities
from
'
~/lib/utils/accessor
'
;
...
...
@@ -112,7 +112,6 @@ export default {
.
catch
(()
=>
{
createFlash
({
message
:
__
(
'
Something went wrong while fetching details
'
),
type
:
FLASH_TYPES
.
ALERT
,
});
this
.
selectedProject
=
null
;
})
...
...
ee/app/assets/javascripts/security_dashboard/store/modules/vulnerabilities/actions.js
View file @
2a86ea2b
...
...
@@ -127,7 +127,6 @@ export const receiveCreateIssueError = ({ commit }, { flashError }) => {
if
(
flashError
)
{
createFlash
({
message
:
s__
(
'
SecurityReports|There was an error creating the issue.
'
),
type
:
'
alert
'
,
parent
:
document
.
querySelector
(
'
.ci-table
'
),
});
}
...
...
@@ -199,7 +198,6 @@ export const receiveDismissSelectedVulnerabilitiesError = ({ commit }, { flashEr
if
(
flashError
)
{
createFlash
({
message
:
s__
(
'
SecurityReports|There was an error dismissing the vulnerabilities.
'
),
type
:
'
alert
'
,
parent
:
document
.
querySelector
(
'
.ci-table
'
),
});
}
...
...
@@ -286,7 +284,6 @@ export const receiveDismissVulnerabilityError = ({ commit }, { flashError }) =>
if
(
flashError
)
{
createFlash
({
message
:
s__
(
'
SecurityReports|There was an error dismissing the vulnerability.
'
),
type
:
'
alert
'
,
parent
:
document
.
querySelector
(
'
.ci-table
'
),
});
}
...
...
@@ -409,7 +406,6 @@ export const receiveUndoDismissError = ({ commit }, { flashError }) => {
if
(
flashError
)
{
createFlash
({
message
:
s__
(
'
SecurityReports|There was an error reverting this dismissal.
'
),
type
:
'
alert
'
,
parent
:
document
.
querySelector
(
'
.ci-table
'
),
});
}
...
...
@@ -477,7 +473,6 @@ export const receiveCreateMergeRequestError = ({ commit }, { flashError }) => {
if
(
flashError
)
{
createFlash
({
message
:
s__
(
'
SecurityReports|There was an error creating the merge request.
'
),
type
:
'
alert
'
,
parent
:
document
.
querySelector
(
'
.ci-table
'
),
});
}
...
...
ee/app/assets/javascripts/status_page_settings/store/actions.js
View file @
2a86ea2b
...
...
@@ -52,6 +52,5 @@ export const receiveStatusPageSettingsUpdateError = (_, error) => {
createFlash
({
message
:
`
${
__
(
'
There was an error saving your changes.
'
)}
${
message
}
`
,
type
:
'
alert
'
,
});
};
ee/spec/frontend/status_page_settings/store/actions_spec.js
View file @
2a86ea2b
...
...
@@ -112,7 +112,6 @@ describe('Status Page actions', () => {
testAction
(
actions
.
receiveStatusPageSettingsUpdateError
,
error
,
null
,
[],
[],
()
=>
{
expect
(
createFlash
).
toHaveBeenCalledWith
({
message
:
`There was an error saving your changes.
${
error
.
response
.
data
.
message
}
`
,
type
:
'
alert
'
,
});
done
();
});
...
...
spec/frontend/grafana_integration/components/grafana_integration_spec.js
View file @
2a86ea2b
...
...
@@ -114,7 +114,6 @@ describe('grafana integration component', () => {
.
then
(()
=>
expect
(
createFlash
).
toHaveBeenCalledWith
({
message
:
`There was an error saving your changes.
${
message
}
`
,
type
:
'
alert
'
,
}),
);
});
...
...
spec/frontend/ide/components/new_dropdown/modal_spec.js
View file @
2a86ea2b
...
...
@@ -184,7 +184,6 @@ describe('new file modal component', () => {
expect
(
createFlash
).
toHaveBeenCalledWith
({
message
:
'
The name "test-path/test" is already taken in this directory.
'
,
type
:
'
alert
'
,
parent
:
expect
.
anything
(),
fadeTransition
:
false
,
addBodyClass
:
true
,
...
...
spec/frontend/incidents_settings/components/incidents_settings_service_spec.js
View file @
2a86ea2b
...
...
@@ -39,7 +39,6 @@ describe('IncidentsSettingsService', () => {
return
service
.
updateSettings
({}).
then
(()
=>
{
expect
(
createFlash
).
toHaveBeenCalledWith
({
message
:
expect
.
stringContaining
(
ERROR_MSG
),
type
:
'
alert
'
,
});
});
});
...
...
spec/frontend/notes/stores/actions_spec.js
View file @
2a86ea2b
...
...
@@ -927,7 +927,6 @@ describe('Actions Notes Store', () => {
expect
(
resp
.
hasFlash
).
toBe
(
true
);
expect
(
createFlash
).
toHaveBeenCalledWith
({
message
:
'
Your comment could not be submitted because something went wrong
'
,
type
:
'
alert
'
,
parent
:
flashContainer
,
});
})
...
...
@@ -1011,7 +1010,6 @@ describe('Actions Notes Store', () => {
expect
(
dispatch
.
mock
.
calls
).
toEqual
([[
'
stopPolling
'
],
[
'
restartPolling
'
]]);
expect
(
createFlash
).
toHaveBeenCalledWith
({
message
:
TEST_ERROR_MESSAGE
,
type
:
'
alert
'
,
parent
:
flashContainer
,
});
});
...
...
@@ -1030,7 +1028,6 @@ describe('Actions Notes Store', () => {
expect
(
dispatch
.
mock
.
calls
).
toEqual
([[
'
stopPolling
'
],
[
'
restartPolling
'
]]);
expect
(
createFlash
).
toHaveBeenCalledWith
({
message
:
'
Something went wrong while applying the suggestion. Please try again.
'
,
type
:
'
alert
'
,
parent
:
flashContainer
,
});
});
...
...
@@ -1104,7 +1101,6 @@ describe('Actions Notes Store', () => {
expect
(
dispatch
.
mock
.
calls
).
toEqual
([[
'
stopPolling
'
],
[
'
restartPolling
'
]]);
expect
(
createFlash
).
toHaveBeenCalledWith
({
message
:
TEST_ERROR_MESSAGE
,
type
:
'
alert
'
,
parent
:
flashContainer
,
});
});
...
...
@@ -1127,7 +1123,6 @@ describe('Actions Notes Store', () => {
expect
(
createFlash
).
toHaveBeenCalledWith
({
message
:
'
Something went wrong while applying the batch of suggestions. Please try again.
'
,
type
:
'
alert
'
,
parent
:
flashContainer
,
});
});
...
...
spec/frontend/operation_settings/components/metrics_settings_spec.js
View file @
2a86ea2b
...
...
@@ -205,7 +205,6 @@ describe('operation settings external dashboard component', () => {
.
then
(()
=>
expect
(
createFlash
).
toHaveBeenCalledWith
({
message
:
`There was an error saving your changes.
${
message
}
`
,
type
:
'
alert
'
,
}),
);
});
...
...
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