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
1e328844
Commit
1e328844
authored
Jul 25, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Makes multiple file commits for realz.
parent
28d6fd18
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
3 deletions
+6
-3
app/assets/javascripts/api.js
app/assets/javascripts/api.js
+2
-1
app/assets/javascripts/repo/index.js
app/assets/javascripts/repo/index.js
+1
-0
app/assets/javascripts/repo/repo_commit_section.vue
app/assets/javascripts/repo/repo_commit_section.vue
+1
-1
app/assets/javascripts/repo/repo_store.js
app/assets/javascripts/repo/repo_store.js
+1
-0
app/views/projects/tree/_tree_content.html.haml
app/views/projects/tree/_tree_content.html.haml
+1
-1
No files found.
app/assets/javascripts/api.js
View file @
1e328844
...
@@ -106,7 +106,8 @@ const Api = {
...
@@ -106,7 +106,8 @@ const Api = {
'
PRIVATE_TOKEN
'
:
token
,
'
PRIVATE_TOKEN
'
:
token
,
},
},
type
:
'
POST
'
,
type
:
'
POST
'
,
data
:
data
,
contentType
:
"
application/json; charset=utf-8
"
,
data
:
JSON
.
stringify
(
data
),
dataType
:
'
json
'
,
dataType
:
'
json
'
,
})
})
.
done
(
commitData
=>
callback
(
commitData
))
.
done
(
commitData
=>
callback
(
commitData
))
...
...
app/assets/javascripts/repo/index.js
View file @
1e328844
...
@@ -22,6 +22,7 @@ function initRepo() {
...
@@ -22,6 +22,7 @@ function initRepo() {
Store
.
currentBranch
=
$
(
"
button.dropdown-menu-toggle
"
).
attr
(
'
data-ref
'
);
Store
.
currentBranch
=
$
(
"
button.dropdown-menu-toggle
"
).
attr
(
'
data-ref
'
);
Store
.
checkIsCommitable
();
Store
.
checkIsCommitable
();
Store
.
projectId
=
repo
.
dataset
.
projectId
;
Store
.
projectId
=
repo
.
dataset
.
projectId
;
Store
.
tempPrivateToken
=
repo
.
dataset
.
tempToken
;
new
Vue
({
new
Vue
({
el
:
repo
,
el
:
repo
,
...
...
app/assets/javascripts/repo/repo_commit_section.vue
View file @
1e328844
...
@@ -31,7 +31,7 @@ const RepoCommitSection = {
...
@@ -31,7 +31,7 @@ const RepoCommitSection = {
}
}
Api
.
commitMultiple
(
Store
.
projectId
,
payload
,
(
data
)
=>
{
Api
.
commitMultiple
(
Store
.
projectId
,
payload
,
(
data
)
=>
{
console
.
log
(
'
got back
'
,
data
);
console
.
log
(
'
got back
'
,
data
);
}
)
}
,
Store
.
tempPrivateToken
);
}
}
},
},
...
...
app/assets/javascripts/repo/repo_store.js
View file @
1e328844
...
@@ -22,6 +22,7 @@ const RepoStore = {
...
@@ -22,6 +22,7 @@ const RepoStore = {
defaultTabSize
:
100
,
defaultTabSize
:
100
,
minTabSize
:
30
,
minTabSize
:
30
,
tabsOverflow
:
41
,
tabsOverflow
:
41
,
tempPrivateToken
:
''
,
activeFile
:
{
activeFile
:
{
active
:
true
,
active
:
true
,
binary
:
false
,
binary
:
false
,
...
...
app/views/projects/tree/_tree_content.html.haml
View file @
1e328844
#repo
{
data:
{
url:
repo_url
(
@project
),
'project-name'
=>
@project
.
name
,
refs_url:
refs_namespace_project_path
(
@project
.
namespace
,
@project
,
format:
"json"
),
project_url:
namespace_project_path
(
@project
.
namespace
,
@project
),
project_id:
@project
.
id
}
}
#repo
{
data:
{
url:
repo_url
(
@project
),
'project-name'
=>
@project
.
name
,
refs_url:
refs_namespace_project_path
(
@project
.
namespace
,
@project
,
format:
"json"
),
project_url:
namespace_project_path
(
@project
.
namespace
,
@project
),
project_id:
@project
.
id
,
temp_token:
@current_user
.
private_token
}
}
-
if
can_edit_tree?
-
if
can_edit_tree?
=
render
'projects/blob/upload'
,
title:
_
(
'Upload New File'
),
placeholder:
_
(
'Upload New File'
),
button_title:
_
(
'Upload file'
),
form_path:
project_create_blob_path
(
@project
,
@id
),
method: :post
=
render
'projects/blob/upload'
,
title:
_
(
'Upload New File'
),
placeholder:
_
(
'Upload New File'
),
button_title:
_
(
'Upload file'
),
form_path:
project_create_blob_path
(
@project
,
@id
),
method: :post
...
...
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