delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Implement the implied CI/CD config for AutoDevOps	Zeger-Jan van de Weg	2017-08-31	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Behind an application setting, which defaults to false, this commit implements the implied CI/CD config. Which means that in the case we can't find the `.gitlab-ci.yml` on the commit we want to start a pipeline for, we fall back to an implied configuration. For now the Bash template has been copied to `Auto-Devops.gitlab-ci.yml` so the tests actually work. Fixes #34777
*	Merge branch ↵	Tim Zallmann	2017-08-31	1	-0/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-public' into 'master' Resolve various visibility level settings issues Closes #31273 See merge request !13442
\| *	add CHANGELOG.md entry for !13442	Mike Greiling	2017-08-26	1	-0/+6
\| \|
* \|	Merge branch 'sh-filter-csrf-params' into 'master'	Robert Speicher	2017-08-31	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Filter additional parameters that have shown up in our logs See merge request !13945
\| * \|	Filter additional secrets from Rails logs	Stan Hu	2017-08-30	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upon inspection of logs, there were a number of fields not filtered. For example: * authenticity_token: CSRF token * rss_token: Used for RSS feeds * secret: Used with Projects::UploadController Rails provides a way to match regexps, so we now filter: * Any parameter ending with `_token` * Any parameter containing `password` * Any parameter containing `secret`
* \| \|	Merge branch 'sidebar-cache-updates' into 'master'	Sean McGivern	2017-08-31	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only update the sidebar count caches when needed See merge request !13878
\| * \| \|	Only update the sidebar count caches when neededsidebar-cache-updates	Yorick Peterse	2017-08-30	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures the issues/MR cache of the sidebar is only updated when the state or confidential flags changes, instead of changing this for every update.
* \| \| \|	Merge branch 'zj-disable-pages-in-subgroups' into 'master'	Grzegorz Bizon	2017-08-31	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show references to Pages when not available Closes #34864 See merge request !13888
\| * \| \| \|	Don't show references to Pages when not available	Zeger-Jan van de Weg	2017-08-31	1	-0/+5
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In this instance its subgroups, and given we can't deploy it, we shouldn't allow it to be shown. Fixes gitlab-org/gitlab-ce#34864
* \| \| \|	Merge branch '28938-password-change-workflow-for-admins' into 'master'	Sean McGivern	2017-08-31	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes the password change workflow for admins. Closes #28938 See merge request !13901
\| * \| \| \|	Changes the password change workflow for admins.28938-password-change-workflow-for-admins	Tiago Botelho	2017-08-31	1	-0/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch '31470-api-file-raw' into 'master'	Sean McGivern	2017-08-31	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the /projects/:id/repository/files/:file_path/raw endpoint to handle dots in the file_path… Closes #31470 See merge request !13512
\| * \| \| \| \|	fix :file_path - add requirements:	Marc Siegfriedt	2017-08-30	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Decrease ABC threshold to 55.25	Maxim Rydkin	2017-08-31	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '37179-dashboard-project-dropdown' into 'master'	Phil Hughes	2017-08-31	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes disabled state from projects dropdown in dashboard page Closes #37179 See merge request !13933
\| * \ \ \ \ \	Merge branch 'master' into 37179-dashboard-project-dropdown37179-dashboard-project-dropdown	Filipa Lacerda	2017-08-31	7	-0/+35
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (65 commits) Upgrade mail and nokogiri gems due to security issues Link out to stackoverflow answer on setting swappiness Document swappiness recomendations in the requirements doc Fix invalid attribute used for time-ago-tooltip component Update latest artifacts doc Add changelog entry for flipping verify_certificates Default LDAP config verify_certificates to true Update share project with groups docs remove accidental console.log from karma tests update specs to match reorganized monitoring components Remove tooltips from new sidebar Use `git update-ref --stdin -z` to delete refs Don't use public_send in destroy_conditionally! helper Remove unused expressions policy from ci/cd config Simplify code for appending strategies in CI/CD config Raise exception when simplifiable ci entry incomplete Add changelog entry Fix MySQL failure for emoji autocomplete max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably) Make namespace dropdown on new project page consistent ...
\| * \| \| \| \| \| \|	Removes disabled state from projects dropdown in dashboard page	Filipa Lacerda	2017-08-30	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Adds a tooltip to the branch name	Filipa Lacerda	2017-08-31	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '26692-predefined-variable-gitlab-user-name' into 'master'	Grzegorz Bizon	2017-08-31	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Predefined Variable GITLAB_USER_NAME" Closes #26692 See merge request !13824
\| * \| \| \| \| \| \|	Add a Build Variable to represent the triggering GitLab user's login username	Mark Fletcher	2017-08-30	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Predefined variable represents the username of the GitLab user that started a build
* \| \| \| \| \| \| \|	Merge branch 'mk-default-ldap-verify-certificates-secure' into 'master'	Douwe Maan	2017-08-31	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default LDAP config verify_certificates to true Closes #33662 See merge request !13915
\| * \| \| \| \| \| \| \|	Add changelog entry for flipping verify_certificatesmk-default-ldap-verify-certificates-secure	Michael Kozono	2017-08-30	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Upgrade mail and nokogiri gems due to security issues	Markus Koller	2017-08-31	1	-0/+5
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '36807-gc-unwanted-refs-after-import' into 'master'	Douwe Maan	2017-08-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unwanted refs after importing a project Closes #36807 See merge request !13766
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-08-31	1	-0/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36807-gc-unwanted-refs-after-import * upstream/master: Don't use public_send in destroy_conditionally! helper Fix MySQL failure for emoji autocomplete max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably) Replace 'project/user_lookup.feature' spinach test with an rspec analog Move GPG signed commits docs to new location
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-08-30	50	-33/+214
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	36807-gc-unwanted-refs-after-import * upstream/master: (225 commits) Add changelog entry Backports EE 2756 logic to CE. Make rubocop happy Make profile settings dropdown consistent Add filter by my reaction Update spec initialization with it being a shared component Update identicon path and selector Renamed to `identicon` and make shared component Merge branch 'master-i18n' into 'master' Fix broken Frontend JS guide Replace 'project/star.feature' spinach test with an rspec analog Adds position fixed to right sidebar Fixes the margin of the top buttons of the pipeline page Remove commented out code Better align fallback image emojis Decrease Metrics/CyclomaticComplexity threshold to 15 Add changelog Respect the default visibility level when creating a group Further break with_repo_branch_commit into parts Make sure inspect doesn't generate crazy string ...
\| * \| \| \| \| \| \| \| \| \|	Add changelog and tests	Lin Jen-Shin	2017-08-23	1	-0/+5
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'check-trigger-permissions-mysql' into 'master'	Douwe Maan	2017-08-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve migrations using triggers Closes #36633 See merge request !13666
\| * \| \| \| \| \| \| \| \| \|	Improve migrations using triggerscheck-trigger-permissions-mysql	Yorick Peterse	2017-08-29	1	-0/+5
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a bunch of checks to migrations that may create or drop triggers. Dropping triggers/functions is done using "IF EXISTS" so we don't throw an error if the object in question has already been dropped. We now also raise a custom error (message) when the user does not have TRIGGER privileges. This should prevent the schema from entering an inconsistent state while also providing the user with enough information on how to solve the problem. The recommendation of using SUPERUSER permissions is a bit extreme but we require this anyway (Omnibus also configures users with this permission). Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36633
* \| \| \| \| \| \| \| \| \|	Merge branch '28453-add-time-estimate-time-spent-to-api-issue-output' into ↵	Robert Speicher	2017-08-30	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add time stats to Issue and Merge Request API Closes #28453 See merge request !13335
\| * \| \| \| \| \| \| \| \|	Add changelog	Travis Miller	2017-08-29	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'replace_spinach_user_lookup.feature' into 'master'	Robert Speicher	2017-08-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace 'project/user_lookup.feature' spinach test with an rspec analog See merge request !13863
\| * \| \| \| \| \| \| \| \|	Replace 'project/user_lookup.feature' spinach test with an rspec analog	blackst0ne	2017-08-30	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'perf.slow-issuable' into 'master'	Sean McGivern	2017-08-30	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Perf.slow issuable Closes #32844 See merge request !13685
\| * \| \| \| \| \| \| \| \|	Add changelog entry	Lin Jen-Shin	2017-08-30	1	-0/+6
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'improve-autocomplete-user-performance' into 'master'	Yorick Peterse	2017-08-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve AutocompleteController#users.json performance Closes #36879 See merge request !13754
\| * \| \| \| \| \| \| \| \|	Improve AutocompleteController#user.json performance	Hiroyuki Sato	2017-08-25	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '34990-top-buttons-misaligned' into 'master'	Phil Hughes	2017-08-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the margin of the top buttons of the pipeline page Closes #34990 See merge request !13908
\| * \| \| \| \| \| \| \| \| \|	Fixes the margin of the top buttons of the pipeline page34990-top-buttons-misaligned	Filipa Lacerda	2017-08-29	1	-0/+5
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '37198-api-doesn-t-respect-default-group-visibility' into 'master'	Sean McGivern	2017-08-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect the default visibility level when creating a group via the API Closes #37198 See merge request !13903
\| * \| \| \| \| \| \| \| \| \|	Add changelog	Robert Schilling	2017-08-29	1	-0/+5
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'api-delete-respect-headers' into 'master'	Sean McGivern	2017-08-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Respect the 'If-Unmodified-Since' for delete endpoints See merge request !9621
\| * \| \| \| \| \| \| \| \| \|	Add changelog and doc	Robert Schilling	2017-08-28	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '37147-fix-fallback-emoji-alignment' into 'master'	Filipa Lacerda	2017-08-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better align fallback image emojis Closes #37147 See merge request !13881
\| * \| \| \| \| \| \| \| \| \| \|	Better align fallback image emojis	Eric Eastwood	2017-08-29	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37147
* \| \| \| \| \| \| \| \| \| \| \|	Add filter by my reaction	Hiroyuki Sato	2017-08-30	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mr-index-eager-load' into 'master'	Douwe Maan	2017-08-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eager load head pipeline projects for MRs index See merge request !13877
\| * \| \| \| \| \| \| \| \| \| \| \|	Eager load head pipeline projects for MRs indexmr-index-eager-load	Yorick Peterse	2017-08-28	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures the project of an MR's head pipeline is eager loaded, preventing an N+1 query problem from occurring when viewing the list of MRs of a project.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'replace_spinach_star.feature' into 'master'	Robert Speicher	2017-08-30	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace 'project/star.feature' spinach test with an rspec analog See merge request !13855
\| * \| \| \| \| \| \| \| \| \| \| \|	Replace 'project/star.feature' spinach test with an rspec analog	blackst0ne	2017-08-30	1	-0/+5
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|