diff options
| author | Regis <boudinot.regis@yahoo.com> | 2016-12-24 02:34:56 +0300 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2016-12-24 02:34:56 +0300 |
| commit | 71d731a21b96cdd9d1881a8e03961f7008cb8d64 (patch) | |
| tree | f31b57dde85b65345733b4bcd3915bab37236e47 /config/routes/project.rb | |
| parent | 115536fbfa9904cef459bb735d29f20756887ebe (diff) | |
| parent | 21fb690c216f9e40be07229726e106d7016e13fc (diff) | |
merge master and fix application.rb conflict
Diffstat (limited to 'config/routes/project.rb')
| -rw-r--r-- | config/routes/project.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 335fccb617b..4d20acbef7a 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -32,10 +32,7 @@ constraints(ProjectUrlConstrainer.new) do resources :commit, only: [:show], constraints: { id: /\h{7,40}/ } do member do get :branches - get :builds get :pipelines - post :cancel_builds - post :retry_builds post :revert post :cherry_pick get :diff_for_path @@ -76,6 +73,8 @@ constraints(ProjectUrlConstrainer.new) do end end + resource :mattermost, only: [:new, :create] + resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :new, :create] do member do put :enable @@ -92,7 +91,6 @@ constraints(ProjectUrlConstrainer.new) do get :diffs get :conflicts get :conflict_for_path - get :builds get :pipelines get :merge_check post :merge |