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
57381b9d
Commit
57381b9d
authored
Jan 14, 2019
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ee_else_ce alias in merge request widget
(cherry picked from commit 5c35cdc929abf5251512ba6ddf7078e570232709)
parent
253b88e3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/vue_merge_request_widget/index.js
app/assets/javascripts/vue_merge_request_widget/index.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+3
-3
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/index.js
View file @
57381b9d
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
MrWidgetOptions
from
'
./ee_switch_mr_widget_options
'
;
import
MrWidgetOptions
from
'
ee_else_ce/vue_merge_request_widget/mr_widget_options.vue
'
;
import
Translate
from
'
../vue_shared/translate
'
;
import
Translate
from
'
../vue_shared/translate
'
;
Vue
.
use
(
Translate
);
Vue
.
use
(
Translate
);
...
...
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
57381b9d
...
@@ -3,6 +3,9 @@ import _ from 'underscore';
...
@@ -3,6 +3,9 @@ import _ from 'underscore';
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
import
Project
from
'
~/pages/projects/project
'
;
import
Project
from
'
~/pages/projects/project
'
;
import
SmartInterval
from
'
~/smart_interval
'
;
import
SmartInterval
from
'
~/smart_interval
'
;
import
MRWidgetStore
from
'
ee_else_ce/vue_merge_request_widget/stores/mr_widget_store
'
;
import
MRWidgetService
from
'
ee_else_ce/vue_merge_request_widget/services/mr_widget_service
'
;
import
stateMaps
from
'
ee_else_ce/vue_merge_request_widget/stores/state_maps
'
;
import
createFlash
from
'
../flash
'
;
import
createFlash
from
'
../flash
'
;
import
WidgetHeader
from
'
./components/mr_widget_header.vue
'
;
import
WidgetHeader
from
'
./components/mr_widget_header.vue
'
;
import
WidgetMergeHelp
from
'
./components/mr_widget_merge_help.vue
'
;
import
WidgetMergeHelp
from
'
./components/mr_widget_merge_help.vue
'
;
...
@@ -28,10 +31,7 @@ import FailedToMerge from './components/states/mr_widget_failed_to_merge.vue';
...
@@ -28,10 +31,7 @@ import FailedToMerge from './components/states/mr_widget_failed_to_merge.vue';
import
MergeWhenPipelineSucceedsState
from
'
./components/states/mr_widget_merge_when_pipeline_succeeds.vue
'
;
import
MergeWhenPipelineSucceedsState
from
'
./components/states/mr_widget_merge_when_pipeline_succeeds.vue
'
;
import
AutoMergeFailed
from
'
./components/states/mr_widget_auto_merge_failed.vue
'
;
import
AutoMergeFailed
from
'
./components/states/mr_widget_auto_merge_failed.vue
'
;
import
CheckingState
from
'
./components/states/mr_widget_checking.vue
'
;
import
CheckingState
from
'
./components/states/mr_widget_checking.vue
'
;
import
MRWidgetStore
from
'
./stores/ee_switch_mr_widget_store
'
;
import
MRWidgetService
from
'
./services/ee_switch_mr_widget_service
'
;
import
eventHub
from
'
./event_hub
'
;
import
eventHub
from
'
./event_hub
'
;
import
stateMaps
from
'
./stores/ee_switch_state_maps
'
;
import
notify
from
'
~/lib/utils/notify
'
;
import
notify
from
'
~/lib/utils/notify
'
;
import
SourceBranchRemovalStatus
from
'
./components/source_branch_removal_status.vue
'
;
import
SourceBranchRemovalStatus
from
'
./components/source_branch_removal_status.vue
'
;
import
GroupedTestReportsApp
from
'
../reports/components/grouped_test_reports_app.vue
'
;
import
GroupedTestReportsApp
from
'
../reports/components/grouped_test_reports_app.vue
'
;
...
...
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
57381b9d
import
Timeago
from
'
timeago.js
'
;
import
Timeago
from
'
timeago.js
'
;
import
getStateKey
from
'
./ee_switch_
get_state_key
'
;
import
getStateKey
from
'
ee_else_ce/vue_merge_request_widget/stores/
get_state_key
'
;
import
{
stateKey
}
from
'
./state_maps
'
;
import
{
stateKey
}
from
'
./state_maps
'
;
import
{
formatDate
}
from
'
../../lib/utils/datetime_utility
'
;
import
{
formatDate
}
from
'
../../lib/utils/datetime_utility
'
;
...
...
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