diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-18 22:23:53 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-18 22:23:53 -0600 |
| commit | 0d2ae3e7c15254aa366665cd0323ba9b7845da70 (patch) | |
| tree | 0e970c96ec83bb3df0ba9059bddd4a0ea881c615 /config | |
| parent | c0ba747c586ff7f5f42097a0e49eace30c57ebdf (diff) | |
| parent | 270dc22658424ee7f279db99e56c6fc69acd3eb7 (diff) | |
| download | gitlab-ce-0d2ae3e7c15254aa366665cd0323ba9b7845da70.tar.gz | |
Merge branch 'master' into go-go-gadget-webpack
* master: (67 commits)
Add some API endpoints for time tracking.
use destructuring syntax instead
add changelog yml file
correct User_agent placement in robots.txt
Fixing typo
Fix Project#update_repository_size to convert MB to Bytes properly
Remove repository trait from factories that don't need it in features
Add the `:repository` trait to `:project` factories in Cucumber steps
Add a `:repository` trait to the `:empty_project` factory
Update clipboard_button text: Copy commit SHA to clipboard
Fix search bar filter dropdown scrollbars
get rid of log
fix UI behaviour - only make new calls when button is clicked and dropdown is not displayed
better UI fix - simple solution
Disable all cops in .rubocop_todo.yml
fix spec
refactored a bunch of stuff based on feedback
fix serializer
fix bug retrieving medians
fix specs
...
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 26e2dc9e6e7..1fc6ed28c74 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -94,6 +94,7 @@ constraints(ProjectUrlConstrainer.new) do get :pipelines get :merge_check post :merge + get :merge_widget_refresh post :cancel_merge_when_build_succeeds get :ci_status get :ci_environments_status diff --git a/config/webpack.config.js b/config/webpack.config.js index 98b87462a94..762147e8b06 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -24,6 +24,7 @@ var config = { environments: './environments/environments_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js', graphs: './graphs/graphs_bundle.js', + issuable: './issuable/issuable_bundle.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', merge_request_widget: './merge_request_widget/ci_bundle.js', network: './network/network_bundle.js', @@ -34,6 +35,7 @@ var config = { users: './users/users_bundle.js', lib_chart: './lib/chart.js', lib_d3: './lib/d3.js', + lib_vue: './lib/vue_resource.js', vue_pipelines: './vue_pipelines_index/index.js', }, |