diff options
author | Robert Speicher <robert@gitlab.com> | 2017-02-17 00:35:32 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-02-17 00:35:32 +0000 |
commit | 797fcd6b2c0a2064de98ebdc10554d660a138f44 (patch) | |
tree | fe4596caa1de622917f4962315a73ed330dd765a /app/assets | |
parent | 416b94f27e84aa2ef5aa61fea58b2bd64a44ac99 (diff) | |
parent | 9f00c2b0d2362232b49ef260e0500b14b975e574 (diff) | |
download | gitlab-ce-797fcd6b2c0a2064de98ebdc10554d660a138f44.tar.gz |
Merge branch '28248-use-page' into 'master'
Use `page` query parameter instead of `p` to keep consistency with all URLs
Closes #28248
See merge request !9268
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 index dac364977d5..0265c00a414 100644 --- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 @@ -29,7 +29,7 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s }, props: ['scope', 'store', 'svgs'], created() { - const pagenum = gl.utils.getParameterByName('p'); + const pagenum = gl.utils.getParameterByName('page'); const scope = gl.utils.getParameterByName('scope'); if (pagenum) this.pagenum = pagenum; if (scope) this.apiScope = scope; @@ -44,7 +44,6 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s }, methods: { - /** * Changes the URL according to the pagination component. * @@ -57,7 +56,7 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s */ change(pagenum, apiScope) { if (!apiScope) apiScope = 'all'; - gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`); + gl.utils.visitUrl(`?scope=${apiScope}&page=${pagenum}`); }, }, template: ` |