diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-04 07:58:34 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-04 07:58:34 +0000 |
| commit | c958c201b72577eb01662cc1dac0f253e3d3e6db (patch) | |
| tree | 26f52060490aaee5c2695e34c57b812383d834a3 /config | |
| parent | 912e6b0b3d887b86bf41066062376438d3377da7 (diff) | |
| parent | ba4a442996d322ca736c97ff6e7f7fdf3860d36a (diff) | |
| download | gitlab-ce-c958c201b72577eb01662cc1dac0f253e3d3e6db.tar.gz | |
Merge branch '31050-registry-image-lists' into 'master'
Lazy load and paginate registry image list
Closes #31050
See merge request gitlab-org/gitlab-ce!14303
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 b36d13888cd..70d7673250c 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -271,7 +271,7 @@ constraints(ProjectUrlConstrainer.new) do namespace :registry do resources :repository, only: [] do - resources :tags, only: [:destroy], + resources :tags, only: [:index, :destroy], constraints: { id: Gitlab::Regex.container_registry_tag_regex } end end diff --git a/config/webpack.config.js b/config/webpack.config.js index 3404715fe30..2eb4444916b 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -68,6 +68,7 @@ var config = { prometheus_metrics: './prometheus_metrics', protected_branches: './protected_branches', protected_tags: './protected_tags', + registry_list: './registry/index.js', repo: './repo/index.js', sidebar: './sidebar/sidebar_bundle.js', schedule_form: './pipeline_schedules/pipeline_schedule_form_bundle.js', @@ -200,6 +201,7 @@ var config = { 'pdf_viewer', 'pipelines', 'pipelines_details', + 'registry_list', 'repo', 'schedule_form', 'schedules_index', |