diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-04 22:48:21 +0000 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-04 22:48:21 +0000 |
commit | 12fbce2eacdfbbc9bca7f7eaca6e5679ee1aaffd (patch) | |
tree | 055c994736a0408af7c6b4c5ff6ca37ec65c336c /config | |
parent | 1bf694fcb95c978e8cf32664b3ced186e7a7d850 (diff) | |
parent | 79dc817183bf1480e72016c3e6a78ac0e57d8c96 (diff) | |
download | gitlab-ce-12fbce2eacdfbbc9bca7f7eaca6e5679ee1aaffd.tar.gz |
Merge branch 'master' into 'add-sentry-js-again-with-vue'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/project.rb | 1 | ||||
-rw-r--r-- | config/routes/uploads.rb | 11 | ||||
-rw-r--r-- | config/webpack.config.js | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 956afe4faa3..085f5a24e2e 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -183,6 +183,7 @@ constraints(ProjectUrlConstrainer.new) do get :download get :browse, path: 'browse(/*path)', format: false get :file, path: 'file/*path', format: false + get :raw, path: 'raw/*path', format: false post :keep end end diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb index 2b22148a134..b315186b178 100644 --- a/config/routes/uploads.rb +++ b/config/routes/uploads.rb @@ -4,6 +4,11 @@ scope path: :uploads do to: "uploads#show", constraints: { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: /[^\/]+/ } + # show uploads for models, snippets (notes) available for now + get ':model/:id/:secret/:filename', + to: 'uploads#show', + constraints: { model: /personal_snippet/, id: /\d+/, filename: /[^\/]+/ } + # Appearance get ":model/:mounted_as/:id/:filename", to: "uploads#show", @@ -13,6 +18,12 @@ scope path: :uploads do get ":namespace_id/:project_id/:secret/:filename", to: "projects/uploads#show", constraints: { namespace_id: /[a-zA-Z.0-9_\-]+/, project_id: /[a-zA-Z.0-9_\-]+/, filename: /[^\/]+/ } + + # create uploads for models, snippets (notes) available for now + post ':model/:id/', + to: 'uploads#create', + constraints: { model: /personal_snippet/, id: /\d+/ }, + as: 'upload' end # Redirect old note attachments path to new uploads path. diff --git a/config/webpack.config.js b/config/webpack.config.js index ea699b1ecba..c005ee0df2a 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -26,6 +26,7 @@ var config = { common_d3: ['d3'], cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', commit_pipelines: './commit/pipelines/pipelines_bundle.js', + deploy_keys: './deploy_keys/index.js', diff_notes: './diff_notes/diff_notes_bundle.js', environments: './environments/environments_bundle.js', environments_folder: './environments/folder/environments_folder_bundle.js', @@ -123,6 +124,7 @@ var config = { 'boards', 'commit_pipelines', 'cycle_analytics', + 'deploy_keys', 'diff_notes', 'environments', 'environments_folder', |