diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-22 20:03:39 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-08-17 17:12:47 +0100 |
| commit | f330585a98b75b75ef2eb9d4897297ada576000d (patch) | |
| tree | 55358c4b7ec29f729c83ab55d2931692f06cef75 /config | |
| parent | 6478adf10cd6b05a89e3396a5beb185dfa2b8cac (diff) | |
| download | gitlab-ce-f330585a98b75b75ef2eb9d4897297ada576000d.tar.gz | |
Added vue-resource to get & save data
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 09a8945c59e..c0691cb6d5a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -832,7 +832,17 @@ Rails.application.routes.draw do end end +<<<<<<< 9d83a366e263d015894908f72576972f87848399 resources :project_members, except: [:show, :new, :edit], constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ }, concerns: :access_requestable do +======= + resources :boards do + collection do + get :all + end + end + + resources :project_members, except: [:new, :edit], constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ }, concerns: :access_requestable do +>>>>>>> Added vue-resource to get & save data collection do delete :leave |