diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-03-27 21:36:36 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-27 21:36:36 +0800 |
| commit | a236e4132e92304ee5d77f507fb98b3f98fd03bd (patch) | |
| tree | 377710f67abd62b69606773b8ae6b38775afccc9 /config | |
| parent | 03cb7935187955ad68a4304a562a94a2eb1f246d (diff) | |
| parent | 40e3a70165a97526edc0caee228bc7b75f62534c (diff) | |
| download | gitlab-ce-a236e4132e92304ee5d77f507fb98b3f98fd03bd.tar.gz | |
Merge remote-tracking branch 'upstream/master' into test-pg-mysql
* upstream/master: (127 commits)
Fixed up issue boards JS specs
Implement new service for creating user
Add Changelog entry for pipeline retry fix
Do not retry jobs multiple times when retrying a pipeline
Update sentry-raven 2.0.2 -> 2.4.0
Update webmock 1.21.0 -> 1.24.6
Update spring 1.7.2 -> 2.0.1
Update simplecov 0.12.0 -> 0.14.1
Update pry-rails 0.3.4 -> 0.3.5
Update pry-byebug 3.4.1 -> 3.4.2
Update flay 2.6.1 -> 2.8.1
Optimize labels finder query
Remove Tags filter from Projects Explore dropdown
Update capybara-screenshot 1.0.11 -> 1.0.14
Update bullet 5.2.0 -> 5.5.1
Update brakeman 3.4.1 -> 3.6.1
Remove web-console gem
Update better_errors 1.0.1 -> 2.1.1
Display flash message to unauthenticated user when creating new issue
Activate group name toggle based on horizontal space
...
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 44b8ae7aedd..823e0614aeb 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -102,6 +102,7 @@ constraints(ProjectUrlConstrainer.new) do get :merge_widget_refresh post :cancel_merge_when_pipeline_succeeds get :ci_status + get :pipeline_status get :ci_environments_status post :toggle_subscription post :remove_wip @@ -152,6 +153,7 @@ constraints(ProjectUrlConstrainer.new) do post :cancel post :retry get :builds + get :status end end diff --git a/config/webpack.config.js b/config/webpack.config.js index 3cf94b9b435..0859c8416c8 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -21,7 +21,7 @@ var config = { common_vue: ['vue', './vue_shared/common_vue.js'], common_d3: ['d3'], main: './main.js', - blob_edit: './blob_edit/blob_edit_bundle.js', + blob: './blob_edit/blob_bundle.js', boards: './boards/boards_bundle.js', simulate_drag: './test_utils/simulate_drag.js', cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', |