summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | | | Pass project to BlobDouwe Maan2017-04-274-5/+13
| | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix_build_header_line_height' into 'master' Annabel Dunstone Gray2017-04-272-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase line-height in build-header so elements don't overlap See merge request !10712
| | * | | | | | | | | | | | | | | | | | | | | | | Increase line-height in build-header so elements don't overlapdixpac2017-04-252-0/+5
| | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'related-branch-ci-status-icon-alignment' into 'master' Annabel Dunstone Gray2017-04-272-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed alignment of CI icon in related issues section Closes #31228 See merge request !10962
| | * | | | | | | | | | | | | | | | | | | | | | | Fixed alignment of CI icon in related issues sectionrelated-branch-ci-status-icon-alignmentPhil Hughes2017-04-272-4/+13
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #31228
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dm-fix-ghost-user-validation' into 'master' Robert Speicher2017-04-273-1/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip validation when creating internal (ghost, service desk) users See merge request !10949
| | * | | | | | | | | | | | | | | | | | | | | | | Skip validation when creating internal (ghost, service desk) usersdm-fix-ghost-user-validationDouwe Maan2017-04-263-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch '31464-move-bundle-check-to-before_script' into 'master' Robert Speicher2017-04-272-8/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run `bundle check` after `bundle install` instead of having a dedicated job for it Closes #31464 See merge request !10944
| | * | | | | | | | | | | | | | | | | | | | | | | | Run `bundle check` after `bundle install` instead of having a dedicated job ↵31464-move-bundle-check-to-before_scriptRémy Coutable2017-04-262-8/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for it Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | | | | | | Add timeagoJacob Schatz2017-04-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Add Vue with async deploy keysJacob Schatz2017-04-273-21/+107
| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/29667-deploy-keys' into ↵Jacob Schatz2017-04-278-2/+148
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deploy-keys-load-async
| * | | | | | | | | | | | | | | | | | | | | | | | expose additional values in deploy key entity29667-deploy-keysJarka Kadlecova2017-04-072-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Project deploy keys json end pointJarka Kadlecova2017-03-248-2/+144
| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' ↵Douwe Maan2017-04-277-36/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' improves test settings for chat notification services for empty projects Closes #31138 See merge request !10886
| * | | | | | | | | | | | | | | | | | | | | | | | | improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projectsTiago Botelho2017-04-277-36/+85
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dz-fix-v3-api-deployments-spec' into 'master' Rémy Coutable2017-04-271-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make api/v3/deployments_spec to actually tests v3 instead of current API See merge request !10965
| * | | | | | | | | | | | | | | | | | | | | | | | | Make api/v3/deployments_spec to actually tests v3dz-fix-v3-api-deployments-specDmitriy Zaporozhets2017-04-271-6/+6
|/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gitter-badge' into 'master' Douwe Maan2017-04-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitter badge in the readme pointing to gitlabhq/gitlabhq See merge request !10968
| * | | | | | | | | | | | | | | | | | | | | | | | | gitter badge in the readme pointing to gitlabhq/gitlabhqJob van der Voort2017-04-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'remove-invalid-services' into 'master' Douwe Maan2017-04-277-24/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove invalid services with nil or empty type See merge request !10847
| * | | | | | | | | | | | | | | | | | | | | | | | | | tadds migration to remove invalid servicesTiago Botelho2017-04-276-25/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | remove invalid servicesTiago Botelho2017-04-262-0/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch ↵Sean McGivern2017-04-273-1/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized' into 'master' Resolve "Milestone sidebar display incorect number of MR when minimized" Closes #31292 See merge request !10933
| * | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] added changelogLuke "Jared" Bennett2017-04-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Added test31292-milestone-sidebar-display-incorect-number-of-mr-when-minimizedLuke "Jared" Bennett2017-04-261-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Correct the resource counted for MR collapsed infoLuke "Jared" Bennett2017-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-275-7/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ordering of commits in the network graph. Closes #30973 See merge request !10936
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add CHANGELOG entry for !1093630973-fix-network-graph-orderingTimothy Andrew2017-04-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fix ordering of commits in the network graph.Timothy Andrew2017-04-274-7/+69
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1 - Prior to this upgrade, the default sort order for commits returned by `Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the graph relied on. - While upgrading `rugged`, the MR also changed this default to `Rugged::SORT_NONE`, which broke commit ordering in the graph. - This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort by date, and changes the graph builder `Network::Graph` so it explictly requests the `:date` sort order
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '2246-uuid-is-nil-for-new-installation' into 'master' Sean McGivern2017-04-275-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazily set UUID in ApplicationSetting for new installations Closes gitlab-ee#2246 See merge request !10893
| * | | | | | | | | | | | | | | | | | | | | | | | | Fill missing uuid on the application_settings table2246-uuid-is-nil-for-new-installationDouglas Barbosa Alexandre2017-04-262-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Add CHANGELOGDouglas Barbosa Alexandre2017-04-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Lazily sets UUID in ApplicationSetting for new installationsDouglas Barbosa Alexandre2017-04-262-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dz-add-cohort-spec' into 'master' Sean McGivern2017-04-271-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase code coverage for admin/cohorts page See merge request !10964
| * | | | | | | | | | | | | | | | | | | | | | | | | | Increase code coverage for admin/cohorts pagedz-add-cohort-specDmitriy Zaporozhets2017-04-271-0/+15
| | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-bump-mail-gem' into 'master' Robert Speicher2017-04-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mail gem to 2.6.5 See merge request !10951
| * | | | | | | | | | | | | | | | | | | | | | | | | | Update mail gem to 2.6.5sh-bump-mail-gemStan Hu2017-04-261-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix the extra backslashes in e-mail names as well as other things: https://github.com/mikel/mail/blob/master/CHANGELOG.rdoc#head
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '31202-timeago-loops' into 'master' Phil Hughes2017-04-277-98/+157
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused code Closes #31202 See merge request !10897
| * | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused codeFilipa Lacerda2017-04-277-98/+157
|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'environments-vue-5' into 'master' Phil Hughes2017-04-276-141/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use vue files for vue components. See merge request !10882
| * | | | | | | | | | | | | | | | | | | | | | | | | | Use vue files for vue components.Filipa Lacerda2017-04-276-141/+167
|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-issue-template-expansion' into 'master' Rémy Coutable2017-04-271-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix checks markup in bug template See merge request !10963
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix checks markup in bug templatefix-issue-template-expansionSean McGivern2017-04-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Triple backticks aren't allowed inside <details> elements, so add an explicit <pre> instead.
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tc-make-user-master-project-by-admin' into 'master' Rémy Coutable2017-04-273-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make namespace owner master of project upon creation Closes #29446 See merge request !10910
| * | | | | | | | | | | | | | | | | | | | | | | | | | Make namespace owner master of project upon creationtc-make-user-master-project-by-adminToon Claes2017-04-273-1/+22
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an admin creates a project in the namespace of a user, that user automatically gains master access to that project.
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '26585-remove-readme-view-caching' into 'master' Douwe Maan2017-04-2722-187/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove view fragment caching for project READMEs Closes #26585 and #29594 See merge request !8838
| * | | | | | | | | | | | | | | | | | | | | | | | | | Remove superfluous if/else branching26585-remove-readme-view-cachingToon Claes2017-04-271-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `MarkupHelper#markup` method does everything we need here.
| * | | | | | | | | | | | | | | | | | | | | | | | | | Avoid including the MarkupHelperToon Claes2017-04-272-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Remove the unnecessary ApplicationSetting stubbingToon Claes2017-04-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |