diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-02 14:03:15 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-02 14:03:15 +0000 |
| commit | dab266219441144a74b86fa27f4e0528810482d1 (patch) | |
| tree | 1ac4d6a649cc568c38a1fff2a999811d432c5378 /config | |
| parent | 84b9aae9cfb8c319d06bcce1e93c2b1bc6f44877 (diff) | |
| parent | 6838c16c49185fb72aa58a9c6591da4ec0fc7acb (diff) | |
| download | gitlab-ce-dab266219441144a74b86fa27f4e0528810482d1.tar.gz | |
Merge branch '31511-jira-settings' into 'master'
Simplify test&save actions when setting a service integration
Closes #31511
See merge request !11599
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 5aac44fce10..14718e2f3c4 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -67,7 +67,7 @@ constraints(ProjectUrlConstrainer.new) do resources :services, constraints: { id: /[^\/]+/ }, only: [:index, :edit, :update] do member do - get :test + put :test end end diff --git a/config/webpack.config.js b/config/webpack.config.js index 89ef30a972e..c99298239b2 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -41,6 +41,7 @@ var config = { group: './group.js', groups_list: './groups_list.js', issue_show: './issue_show/index.js', + integrations: './integrations', locale: './locale/index.js', main: './main.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', |