diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-06 15:16:38 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-06 15:16:38 +0200 |
| commit | 8189347b4986e2e44b30d04bf9e83c11e76feef8 (patch) | |
| tree | 2de0e9b37d8938966fa48876b83313fb76b99b6f /config | |
| parent | c288ca78b42986ea1cc315d46d58fc25f7ff8f85 (diff) | |
| parent | b97f9629cabadca1125351a8aa514791524dea3f (diff) | |
| download | gitlab-ce-8189347b4986e2e44b30d04bf9e83c11e76feef8.tar.gz | |
Merge branch 'master' into zj-auto-devops-table
Diffstat (limited to 'config')
| -rw-r--r-- | config/dependency_decisions.yml | 12 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index ca5b941aebf..d6c3c84851b 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -404,3 +404,15 @@ :why: https://github.com/mafintosh/thunky/blob/master/README.md#license :versions: [] :when: 2017-08-07 05:56:09.907045000 Z +- - :whitelist + - Unlicense + - :who: Nick Thomas <nick@gitlab.com> + :why: https://gitlab.com/gitlab-com/organization/issues/116 + :versions: [] + :when: 2017-09-01 17:17:51.996511844 Z +- - :blacklist + - Facebook BSD+PATENTS + - :who: Nick Thomas <nick@gitlab.com> + :why: https://gitlab.com/gitlab-com/organization/issues/117 + :versions: [] + :when: 2017-09-04 12:59:51.150798717 Z diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 545c01e1156..c5704ac5857 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -508,7 +508,7 @@ production: &base failure_count_threshold: 10 # number of failures before stopping attempts failure_wait_time: 30 # Seconds after an access failure before allowing access again failure_reset_time: 1800 # Time in seconds to expire failures - storage_timeout: 5 # Time in seconds to wait before aborting a storage access attempt + storage_timeout: 30 # Time in seconds to wait before aborting a storage access attempt ## Backup settings diff --git a/config/routes/project.rb b/config/routes/project.rb index c703a7294ed..a15e7f8a344 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -303,6 +303,7 @@ constraints(ProjectUrlConstrainer.new) do member do post :toggle_subscription post :mark_as_spam + post :move get :referenced_merge_requests get :related_branches get :can_create_branch diff --git a/config/webpack.config.js b/config/webpack.config.js index ad88e48550d..6b0cd023291 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -30,7 +30,7 @@ var config = { blob: './blob_edit/blob_bundle.js', boards: './boards/boards_bundle.js', common: './commons/index.js', - common_vue: ['vue', './vue_shared/common_vue.js'], + common_vue: './vue_shared/vue_resource_interceptor.js', common_d3: ['d3'], cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', commit_pipelines: './commit/pipelines/pipelines_bundle.js', |