summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-08-19 10:58:01 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-08-19 10:58:01 +0000
commit07f34709fcd2502963037c5f7f7adb8ec32dfc7b (patch)
tree01fb69152a6129f9e4d3dc304dd40c22937cd902 /config
parent473db1f9743f6f07b7c3d7fa53170d01662f9c82 (diff)
parent12fe6a6fd733110acc72aa0f5bdaec2b1fa1f358 (diff)
downloadgitlab-ce-07f34709fcd2502963037c5f7f7adb8ec32dfc7b.tar.gz
Merge branch 'master' into 'expiration-date-on-memberships'
# Conflicts: # db/schema.rb
Diffstat (limited to 'config')
-rw-r--r--config/application.rb1
-rw-r--r--config/routes.rb9
2 files changed, 10 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 0c136623477..6b80f8ddafa 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -85,6 +85,7 @@ module Gitlab
config.assets.precompile << "users/users_bundle.js"
config.assets.precompile << "network/network_bundle.js"
config.assets.precompile << "profile/profile_bundle.js"
+ config.assets.precompile << "diff_notes/diff_notes_bundle.js"
config.assets.precompile << "boards/boards_bundle.js"
config.assets.precompile << "boards/test_utils/simulate_drag.js"
config.assets.precompile << "lib/utils/*.js"
diff --git a/config/routes.rb b/config/routes.rb
index 5c48bf233d6..66f77aee06a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -749,6 +749,13 @@ Rails.application.routes.draw do
get :update_branches
get :diff_for_path
end
+
+ resources :discussions, only: [], constraints: { id: /\h{40}/ } do
+ member do
+ post :resolve
+ delete :resolve, action: :unresolve
+ end
+ end
end
resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
@@ -858,6 +865,8 @@ Rails.application.routes.draw do
member do
post :toggle_award_emoji
delete :delete_attachment
+ post :resolve
+ delete :resolve, action: :unresolve
end
end