summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Merge branch 'emoji-picker-fix' into emoji-picker-searchValery Sizov2015-12-241-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into emoji-picker-searchValery Sizov2015-12-2442-106/+203
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixes after reviewValery Sizov2015-12-245-7/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'emoji-picker-fix' into emoji-picker-searchValery Sizov2015-12-248-45/+13791
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | emoji picker searchValery Sizov2015-12-236-1/+47
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix-milestones-with-slashes' into 'master' Dmitriy Zaporozhets2015-12-243-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when global milestones have slashes * Closes #4226 * Closes https://github.com/gitlabhq/gitlabhq/issues/9921 See merge request !2182
| * | | | | | | | | | | | Fix Error 500 when global milestones have slashesStan Hu2015-12-223-1/+14
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #4226
* | | | | | | | | | | | Merge branch 'new-nav-width' into 'master' Dmitriy Zaporozhets2015-12-241-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nav full width old ![Screen_Shot_2015-12-21_at_3.47.01_PM](/uploads/ef47c61eb33521087fc40d400d01cba8/Screen_Shot_2015-12-21_at_3.47.01_PM.png) new ![Screenshot_2015-12-24_12.16.53](/uploads/30cf37886b3710a22daa0b82583975e9/Screenshot_2015-12-24_12.16.53.png) See merge request !2200
| * | | | | | | | | | | | nav full widthnew-nav-widthAndriy Dyadyura2015-12-241-0/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-2431-307/+596
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically fork a project when not allowed to edit a file. Fixes #3215. To do: - [ ] Add tests ----- ## "Edit" button on file in a project the user does NOT have write access to ![edit_file](/uploads/7602157420768aef483a6586bba2d164/edit_file.png) ## Clicking will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the edit page on the original project with a notice ![edit_notice](/uploads/94ed1319404370ff1e9c0d672fb41e03/edit_notice.png) ## The user cannot change the target branch and is informed that editing will start an MR ![edit_footer](/uploads/4da68d4795c7177e575b7c434d16eeae/edit_footer.png) ## Hitting "Commit changes" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.38.08](/uploads/d777a4db6f38a5a1be84031694465bc1/Screen_Shot_2015-12-17_at_23.38.08.png) ----- ## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to ![new_directory](/uploads/72f556248f30d6652523bbb4be01b3e0/new_directory.png) ## Clicking any of these options will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the tree page on the original project with a notice ![new_directory_notice](/uploads/a1a3e11308ae0e8f0913fae6813a37ed/new_directory_notice.png) ## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR ![new_dir](/uploads/99ca8cbfb2f70603e352b3fdf67b6281/new_dir.png) ## Hitting "Create directory" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.39.19](/uploads/3713d0235abf831361b803a6198c5bc1/Screen_Shot_2015-12-17_at_23.39.19.png) cc @dzaporozhets @skyruler See merge request !2145
| * | | | | | | | | | | | Fix specedit-on-forkDouwe Maan2015-12-211-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add tests for new functionalityDouwe Maan2015-12-213-15/+122
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix specsDouwe Maan2015-12-191-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into edit-on-forkDouwe Maan2015-12-1811-61/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/tree/_tree_header.html.haml
| * | | | | | | | | | | | | Fix specsDouwe Maan2015-12-181-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix specs and behavior for LFS filesDouwe Maan2015-12-187-19/+25
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Satisfy RubocopDouwe Maan2015-12-183-4/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-1829-273/+452
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' Douwe Maan2015-12-247-14/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix/visibility level setting in forked projects Fixes #3136 /cc @DouweM See merge request !1744
| * | | | | | | | | | | | | | Add some specs for forked project visibility_level casesTomasz Maczukin2015-12-242-0/+63
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-12-211125-13108/+17540
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (723 commits) Bump Rack Attack to v4.3.1 for security fix Remove duplicate entry in the changelog Remove extra spaces after branchname Fix merge-request-reopen button title Add branch and tag operation to tree dropdown Use gitlab-shell 2.6.9 Clarify Windows shell executor artifact upload support Fix feature specs: we always show the build status if ci_commit is present Do not display project group/name when issue and MR are in same project Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled Use gitlab-workhorse 0.5.1 Fix ci_projects migration by using the value only from latest row [ci skip] Revert sidebar position for issue and merge request Add info on using private Docker registries in CI [ci skip] Upgrade Poltergeist to 1.8.1. #4131 Fix ux issue with "This issue will be closed automatically" message Move MR Builds tab next to Commits Api support for requesting starred projects for user Fix Rubocop complain. Fix merge widget JS for buttons ... Conflicts: app/models/project.rb
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-20500-3113/+9065
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (296 commits) fox tests Don't rescue Exception, but StandardError adressing comments Update gitlab-shell documentation [ci skip] Align hash literals in IssuesFinder spec Fix tests Fix 'Attach a file' link in new tag form Add link to git-lfs client [ci skip] Do not limit workhorse POST/PUT size in NGINX added specs added spinach tests Since GitLab CI is enabled by default, remove enabling it by pushing .gitlab-ci.yml Fix tests Commits without .gitlab-ci.yml are marked as skipped Changelog entry for finding issues performance Use a JOIN in IssuableFinder#by_project Memoize IssuableFinder#projects Removed trailing whitespace from IssuableFinder Added benchmark for IssuesFinder Updated DB schema with new issues/projects indexes ... Conflicts: app/models/project.rb
| * | | | | | | | | | | | | | | | Change update_forks_visibility_level into after_update hook in Project modelTomasz Maczukin2015-11-202-14/+13
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Prevent unnecessary forks iteration at parent updateTomasz Maczukin2015-11-191-3/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Change forks method to has_many relationTomasz Maczukin2015-11-182-8/+6
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-0653-243/+282
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Add CI permissions and api links to README [ci skip] Remove duplicate documentation links make migrations reversible Add missing stage to builds view CI details cleanup Allow groups to appear in the search results if the group owner allows it Update installation.md update example of regex for pytest-cov
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-0452-140/+399
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (23 commits) Use single spaces Improvements to profile page UI Replace all usages of `git` command with configurable binary path Update Shell Commands doc for configurable git binary path Minor reformatting for Facebook integration doc Use proper labels for OAuth providers Add Facebook authentication Bump stamp to ~> 0.6.0 Add extra padding between user description and links on profile page Fix tests Fix clipboard button overflow Apply new design for user profile page Improve profile page UI Better name for up-level links Fixed User sorting specs Only sort by IDs by default Added benchmark for User.all Add changelog entry for contacted_at Spread out runner contacted_at updates Only redirect to homepage url when its not the root url ...
| * | | | | | | | | | | | | | | | | | Update forks visibility_level after parent project visibility_level changeTomasz Maczukin2015-11-042-14/+40
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix GitlabV::isibilityLevel::level_name methodTomasz Maczukin2015-11-041-1/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix Project update serviceTomasz Maczukin2015-11-032-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When project is updated and it is a fork, then visibility_level should not be less restrictive than in its parent project.
| * | | | | | | | | | | | | | | | | | Move level_name resolving to Gitlan::VisibilityLevelTomasz Maczukin2015-11-032-4/+10
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Move visibility_level check for forked projects to Project modelTomasz Maczukin2015-11-032-2/+6
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'branch-invalid-name' into 'master' Douwe Maan2015-12-248-9/+251
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add JS validation for invalid characters in branch name Fixes #3293 Demo: ![out-1080p](/uploads/ba21c359b6b8b440c40cacf772ec0df7/out-1080p.gif) See merge request !2122
| * | | | | | | | | | | | | | | | | | | Add helper methods to JS validation spec for invalid branch namesbranch-invalid-nameDouglas Barbosa Alexandre2015-12-221-87/+92
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix minor stylistic complaintsDouglas Barbosa Alexandre2015-12-213-39/+38
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix specDouglas Barbosa Alexandre2015-12-181-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into branch-invalid-nameDouglas Barbosa Alexandre2015-12-1829-289/+420
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add specs for JS validation for invalid characters in branch nameDouglas Barbosa Alexandre2015-12-172-0/+159
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add restriction for single characters in branch nameDouglas Barbosa Alexandre2015-12-171-2/+8
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Remove extra spaces in the error messagesDouglas Barbosa Alexandre2015-12-171-3/+3
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add JS validation for invalid characters in branch nameDouglas Barbosa Alexandre2015-12-175-8/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More info about valid ref names: https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.ht ml
| * | | | | | | | | | | | | | | | | | | | Remove the hint on the branch name inputDouglas Barbosa Alexandre2015-12-161-1/+0
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add more descriptive error message when create branch with invalid nameDouglas Barbosa Alexandre2015-12-163-2/+3
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'issue_4189' into 'master' Douwe Maan2015-12-243-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix redirect to wrong URL when merging and MR detail URL has an anchor. Closes #4189 See merge request !2169
| * | | | | | | | | | | | | | | | | | | | | Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189issue_4189Rubén Dávila2015-12-213-1/+13
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'emoji-picker-fix' into 'master' Valery Sizov2015-12-249-47/+13793
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emoji picker: better alias handling related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576 See merge request !2198
| * | | | | | | | | | | | | | | | | | | | fix specemoji-picker-fixValery Sizov2015-12-241-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Emoji picker: better alias handlingValery Sizov2015-12-248-45/+13791
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs-bump-underscore-rails' into 'master' Dmitriy Zaporozhets2015-12-242-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump underscore-rails to ~> 1.8.0 Addresses #2857 See merge request !2193
| * | | | | | | | | | | | | | | | | | | Bump underscore-rails to ~> 1.8.0rs-bump-underscore-railsRobert Speicher2015-12-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses #2857