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
87a388a2
Commit
87a388a2
authored
Feb 27, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'ee-refactor-commit-show'
# Conflicts: # config/webpack.config.js
parents
4c4f5be3
dbbe6452
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
13 additions
and
10 deletions
+13
-10
app/assets/javascripts/commit/pipelines/pipelines_bundle.js
app/assets/javascripts/commit/pipelines/pipelines_bundle.js
+2
-2
app/assets/javascripts/environments/folder/environments_folder_bundle.js
...scripts/environments/folder/environments_folder_bundle.js
+2
-2
app/assets/javascripts/pages/projects/commit/pipelines/index.js
...sets/javascripts/pages/projects/commit/pipelines/index.js
+2
-0
app/assets/javascripts/pages/projects/environments/folder/index.js
...s/javascripts/pages/projects/environments/folder/index.js
+3
-0
app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js
...ipts/pages/projects/merge_requests/creations/new/index.js
+2
-0
app/assets/javascripts/pages/projects/merge_requests/show/index.js
...s/javascripts/pages/projects/merge_requests/show/index.js
+2
-0
app/views/projects/commit/_pipelines_list.haml
app/views/projects/commit/_pipelines_list.haml
+0
-1
app/views/projects/environments/folder.html.haml
app/views/projects/environments/folder.html.haml
+0
-1
config/webpack.config.js
config/webpack.config.js
+0
-4
No files found.
app/assets/javascripts/commit/pipelines/pipelines_bundle.js
View file @
87a388a2
...
...
@@ -15,7 +15,7 @@ const CommitPipelinesTable = Vue.extend(commitPipelinesTable);
window
.
gl
=
window
.
gl
||
{};
window
.
gl
.
CommitPipelinesTable
=
CommitPipelinesTable
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
export
default
()
=>
{
const
pipelineTableViewEl
=
document
.
querySelector
(
'
#commit-pipeline-table-view
'
);
if
(
pipelineTableViewEl
)
{
...
...
@@ -43,4 +43,4 @@ document.addEventListener('DOMContentLoaded', () => {
pipelineTableViewEl
.
appendChild
(
table
.
$el
);
}
}
}
)
;
};
app/assets/javascripts/environments/folder/environments_folder_bundle.js
View file @
87a388a2
...
...
@@ -5,7 +5,7 @@ import Translate from '../../vue_shared/translate';
Vue
.
use
(
Translate
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
new
Vue
({
export
default
()
=>
new
Vue
({
el
:
'
#environments-folder-list-view
'
,
components
:
{
environmentsFolderApp
,
...
...
@@ -32,4 +32,4 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
},
});
},
})
)
;
});
app/assets/javascripts/pages/projects/commit/pipelines/index.js
View file @
87a388a2
import
MiniPipelineGraph
from
'
~/mini_pipeline_graph_dropdown
'
;
import
initPipelines
from
'
~/commit/pipelines/pipelines_bundle
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
MiniPipelineGraph
({
container
:
'
.js-commit-pipeline-graph
'
,
}).
bindEvents
();
$
(
'
.commit-info.branches
'
).
load
(
document
.
querySelector
(
'
.js-commit-box
'
).
dataset
.
commitPath
);
initPipelines
();
});
app/assets/javascripts/pages/projects/environments/folder/index.js
0 → 100644
View file @
87a388a2
import
initEnvironmentsFolderBundle
from
'
~/environments/folder/environments_folder_bundle
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initEnvironmentsFolderBundle
);
app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js
View file @
87a388a2
import
Compare
from
'
~/compare
'
;
import
MergeRequest
from
'
~/merge_request
'
;
import
initPipelines
from
'
~/commit/pipelines/pipelines_bundle
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
mrNewCompareNode
=
document
.
querySelector
(
'
.js-merge-request-new-compare
'
);
...
...
@@ -14,5 +15,6 @@ document.addEventListener('DOMContentLoaded', () => {
new
MergeRequest
({
// eslint-disable-line no-new
action
:
mrNewSubmitNode
.
dataset
.
mrSubmitAction
,
});
initPipelines
();
}
});
app/assets/javascripts/pages/projects/merge_requests/show/index.js
View file @
87a388a2
...
...
@@ -7,6 +7,7 @@ import ShortcutsIssuable from '~/shortcuts_issuable';
import
Diff
from
'
~/diff
'
;
import
{
handleLocationHash
}
from
'
~/lib/utils/common_utils
'
;
import
howToMerge
from
'
~/how_to_merge
'
;
import
initPipelines
from
'
~/commit/pipelines/pipelines_bundle
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
Diff
();
// eslint-disable-line no-new
...
...
@@ -15,6 +16,7 @@ document.addEventListener('DOMContentLoaded', () => {
initIssuableSidebar
();
initNotes
();
initDiffNotes
();
initPipelines
();
const
mrShowNode
=
document
.
querySelector
(
'
.merge-request
'
);
...
...
app/views/projects/commit/_pipelines_list.haml
View file @
87a388a2
...
...
@@ -9,4 +9,3 @@
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
(
'commit_pipelines'
)
app/views/projects/environments/folder.html.haml
View file @
87a388a2
...
...
@@ -3,7 +3,6 @@
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
(
"environments_folder"
)
#environments-folder-list-view
{
data:
{
endpoint:
folder_project_environments_path
(
@project
,
@folder
,
format: :json
),
"folder-name"
=>
@folder
,
...
...
config/webpack.config.js
View file @
87a388a2
...
...
@@ -53,9 +53,7 @@ var config = {
common
:
'
./commons/index.js
'
,
common_vue
:
'
./vue_shared/vue_resource_interceptor.js
'
,
cycle_analytics
:
'
./cycle_analytics/cycle_analytics_bundle.js
'
,
commit_pipelines
:
'
./commit/pipelines/pipelines_bundle.js
'
,
environments
:
'
./environments/environments_bundle.js
'
,
environments_folder
:
'
./environments/folder/environments_folder_bundle.js
'
,
filtered_search
:
'
./filtered_search/filtered_search_bundle.js
'
,
help
:
'
./help/help.js
'
,
merge_conflicts
:
'
./merge_conflicts/merge_conflicts_bundle.js
'
,
...
...
@@ -259,11 +257,9 @@ var config = {
name
:
'
common_vue
'
,
chunks
:
[
'
boards
'
,
'
commit_pipelines
'
,
'
cycle_analytics
'
,
'
deploy_keys
'
,
'
environments
'
,
'
environments_folder
'
,
'
filtered_search
'
,
'
groups
'
,
'
merge_conflicts
'
,
...
...
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