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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Changes after reviewenvironments-vue-5	Filipa Lacerda	2017-04-27	3	-14/+12
\|
*	Changes after review	Filipa Lacerda	2017-04-26	2	-11/+8
\|
*	Merge branch 'master' into environments-vue-5	Filipa Lacerda	2017-04-25	42	-5796/+1071
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Fix scoping issues with Spinach tests (e.g. https://gitlab.com/gitlab-org/gitlab-ce/builds/14929499) Update changelog Ensure replying to an individual note by email creates a note with its own discussion ID Optimize project namespace lookup for milestones and add specs Fix commenting on an existing discussion on an unchanged line that is no longer in the diff Improve specs Eliminate N+1 queries in loading namespaces for every issuable in milestones Use jQuery niceness on blob_fork_suggestion Add normal wrapping to task lists Remove names from docs and add vue experts instead Add tests Pulled in latest changes Pulled in latest changes from NotebookLab Add aria to icon Pull in fixture files from the repo Removed notebooklab vendor file Moved NotebookLab assets into repo
\| *	Merge branch 'sh-fix-spinach-5-10-tests' into 'master'	Robert Speicher	2017-04-24	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix scoping issues with Spinach tests See merge request !10895
\| \| *	Fix scoping issues with Spinach tests (e.g. ↵sh-fix-spinach-5-10-tests	Stan Hu	2017-04-24	1	-1/+1
\| \|/ \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/builds/14929499)
\| *	Merge branch 'vue-experts' into 'master'	Jacob Schatz	2017-04-24	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove names from docs and add vue experts instead See merge request !10817
\| \| *	Remove names from docs and add vue experts insteadvue-experts	Filipa Lacerda	2017-04-20	1	-1/+1
\| \| \|
\| * \|	Merge branch 'use-jquery-on-blob-fork-suggestion' into 'master'	Jacob Schatz	2017-04-24	3	-44/+43
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use jQuery niceness on blob_fork_suggestion See merge request !10858
\| \| * \|	Use jQuery niceness on blob_fork_suggestionuse-jquery-on-blob-fork-suggestion	Eric Eastwood	2017-04-22	3	-44/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10602#note_27871752
\| * \| \|	Merge branch 'add-aria-to-icon' into 'master'	Jacob Schatz	2017-04-24	3	-0/+24
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add aria to icon See merge request !10670
\| \| * \| \|	Update changelog	Clement Ho	2017-04-24	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Improve specsadd-aria-to-icon	Clement Ho	2017-04-24	1	-1/+3
\| \| \| \| \|
\| \| * \| \|	Add tests	Clement Ho	2017-04-18	2	-1/+14
\| \| \| \| \|
\| \| * \| \|	Add aria to icon	Clement Ho	2017-04-12	2	-0/+9
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master'	Sean McGivern	2017-04-24	4	-1/+22
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure replying to an individual note by email creates a note with its own discussion ID Closes #31067 See merge request !10890
\| \| * \| \| \|	Ensure replying to an individual note by email creates a note with its own ↵dm-fix-individual-notes-reply-attributes	Douwe Maan	2017-04-24	4	-1/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	discussion ID
\| * \| \| \| \|	Merge branch '31269-task-scroll' into 'master'	Jacob Schatz	2017-04-24	1	-0/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add normal wrapping to task lists Closes #31269 See merge request !10860
\| \| * \| \| \| \|	Add normal wrapping to task lists31269-task-scroll	Annabel Dunstone Gray	2017-04-21	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'notebooklab-in-repo' into 'master'	Jacob Schatz	2017-04-24	22	-5736/+933
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved NotebookLab assets into repo See merge request !10630
\| \| * \ \ \ \ \	Merge branch 'master' into notebooklab-in-reponotebooklab-in-repo	Phil Hughes	2017-04-13	61	-2015/+2137
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Pulled in latest changes	Phil Hughes	2017-04-13	1	-14/+59
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Pulled in latest changes from NotebookLab	Phil Hughes	2017-04-13	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' into notebooklab-in-repo	Phil Hughes	2017-04-13	162	-1219/+3343
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Pull in fixture files from the repo	Phil Hughes	2017-04-11	6	-7/+49
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Removed notebooklab vendor file	Phil Hughes	2017-04-11	1	-5887/+0
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Moved NotebookLab assets into repo	Phil Hughes	2017-04-11	19	-2/+841
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved all the notebooklab assets into the GitLab repo
\| * \| \| \| \| \| \| \| \|	Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master'	Sean McGivern	2017-04-24	4	-5/+28
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in loading namespaces for every issuable in milestones See merge request !10871
\| \| * \| \| \| \| \| \| \| \|	Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-url	Stan Hu	2017-04-24	3	-5/+24
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Eliminate N+1 queries in loading namespaces for every issuable in milestones	Stan Hu	2017-04-23	2	-1/+5
\| \| \| \|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we rely on the helper functions in `GitlabRoutingHelper` for `merge_request_path`, we end up calling a database query to look up the Namespace association for every merge request since `entity.project.namespace` is called. By reusing the project defined in the controller, we avoid that problem. Partial fix to #27387
\| * \| \| \| \| \| \| \| \|	Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master'	Sean McGivern	2017-04-24	3	-8/+15
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commenting on an existing discussion on an unchanged line that is no longer in the diff Closes #31339 See merge request !10888
\| \| * \| \| \| \| \| \| \| \|	Fix commenting on an existing discussion on an unchanged line that is no ↵	Douwe Maan	2017-04-24	3	-8/+15
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	longer in the diff
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' into environments-vue-5	Filipa Lacerda	2017-04-24	219	-684/+787
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (38 commits) Cache Routable#full_path in RequestStore to reduce duplicate route loads Fix outdated specs that were not executed due to wrong filename Fixes the spacing around diff discussion buttons Fix incorrect spec filenames which were ingored by CI Simplify specs and remove unnecessary attributes Refactor ExpirePipelineCacheWorker#perform Use a better performing query to find all MRs for pipeline Properly expire cache for all MRs of a pipeline Added test to prevent ‘Request access’ regression Unnecessary "include WaitForAjax" and "include ApiHelpers" Add changelog entry for latest commit status fix Add specs for new ci status helper method Deprecate legacy CI/CD status helpers Fix lastest commit status text on main project page Correct typo (missing 's') in project pipeline job list endpoint Add changelog entry for blocked pipeline duration fix Improve helpers in pipeline model specs Fix missing pipeline duration for blocked pipelines Make handler metric params more explicit Use `:empty_project` where possible in top-level feature specs ...
\| * \| \| \| \| \| \| \| \|	Merge branch 'diff-discussion-buttons-spacing' into 'master'	Annabel Dunstone Gray	2017-04-24	2	-0/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the spacing around diff discussion buttons Closes #31102 See merge request !10879
\| \| * \| \| \| \| \| \| \| \|	Fixes the spacing around diff discussion buttonsdiff-discussion-buttons-spacing	Phil Hughes	2017-04-24	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31102
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'test-pg' into 'master'	Rémy Coutable	2017-04-24	6	-85/+212
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test both PostgreSQL and MySQL for the win Closes #2582 See merge request !10156
\| \| * \| \| \| \| \| \| \| \| \|	Properly use $BUNDLE_INSTALL_FLAGStest-pg-mysql test-pg	Lin Jen-Shin	2017-04-13	2	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Always use . and add more comments to prepare_build.sh	Lin Jen-Shin	2017-04-13	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into test-pg-mysql	Lin Jen-Shin	2017-04-12	19	-146/+221
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: Setup and run a Gitaly server for testing if GitalyClient is enabled Update changelog with MR id Move permission to create subgroup into GroupPolicy Fix issue's note cache expiration after delete fix(subgroups): add verification of group creation capability to subgroup UI
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove duplicated line	Lin Jen-Shin	2017-04-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into test-pg-mysql	Lin Jen-Shin	2017-04-12	185	-1248/+3349
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (90 commits) Fixed notebooklab code including file paths [BB Importer] Save the error trace and the whole raw document Statisfy Robertcop and Seancop Update documents according to: Update licenses.csv via: Update templates via: Add foreign key on trigger requests Added CHANGELOG Added tests and fixed a typo Fix typo on the class merge-when-pipeline_succeeds Axil's review remove unnecessary line typo fix typo fix links Remove an unused `cared` scope from Issue and MergeRequest Remove an unused `Issue.open_for` scope add topic: authentication Fix edit button on blame page without repo perms Don't show 'Copy content' button on text files that are not rendered as text ...
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Avoid Rails generating complicated query, see:	Lin Jen-Shin	2017-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/builds/14070787
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Move variables back to where they are	Lin Jen-Shin	2017-04-11	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Just set GITLAB_DATABASE in the script	Lin Jen-Shin	2017-04-11	2	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add # host for development and test as well	Lin Jen-Shin	2017-04-11	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	We cannot use array in yaml variables	Lin Jen-Shin	2017-04-11	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Set profiler only for postgresql not mysql	Lin Jen-Shin	2017-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10156#note_26812609
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Use GITLAB_DATABASE: $CI_JOB_NAME[1] so that we	Lin Jen-Shin	2017-04-10	2	-29/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reduce variables definitions. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10156#note_26811996
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Replace on host rather than socket, feedback:	Lin Jen-Shin	2017-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10156#note_26812377
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into test-pg-mysql	Lin Jen-Shin	2017-04-10	462	-4822/+10582
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (238 commits) Periodically clean up temporary upload files to recover storage space Add a name field to the group edit form Remove the User#is_admin? method Fix specs Enable RSpec/DescribeSymbol; update .rubocop_todo.yml Update rubocop-rspec 1.12.0 -> 1.15.0 Rename displaying_blame to blame Actually include WaitForAjax! Don't show Copy contents button on Blame page alfredo review changes Give explicit height to SVG icons for Safari Update MR title change icon Put back usernames in activity and profile feed Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run Revert yarn.lock changes add CHANGELOG.md entry for !10522 upgrade webpack-dev-server to fix issues with SockJS causing odd reload behavior in firefox upgrade webpack to v2.3.3 to resolve sourcemap issues Rever yarn.lock changes Revert yarn.lock file changes ...
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into test-pg-mysql	Lin Jen-Shin	2017-04-07	1165	-6149/+77800
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (590 commits) Fixes failing spec Fix icon name error Rewrite system note helper Change edit icon Leave icon area blank if legacy note; remove diamond icon Fix positioning of note icons Fix newline errors Add remaining system note icons Add system notes icon helper; add icons Fixed specs Updated JS that was causing the hints to appear & then disappear Update tests Fix broken spinach test Reuse code Improve shortcuts code Adds ShortcutsDashboardNavigation to globals comment since its a global variable Fix shortcut specs Reorganize shortcut help menu Change todos shortcut to shift Change shortcuts Switch global shortcuts to shift; reuse key styles from help menu ...