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

	Commit message (Collapse)	Author	Age	Files	Lines
*	issues_for_nodes => issuables_for_nodes31280-skip-issueables-without-project	Lin Jen-Shin	2017-04-26	1	-3/+3
\|
*	Follow feedback on the review	Lin Jen-Shin	2017-04-26	2	-27/+51
\|
*	Skip issuable without a project in IssuableExtractor#extract	Lin Jen-Shin	2017-04-25	4	-56/+71
\| \| \| \|	Closes #31280
*	Merge branch 'master' into 'master'	Rémy Coutable	2017-04-25	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Fix typo in discussions doc. See merge request !10889
\| *	Fix typo in discussions doc.	Marland Sitt	2017-04-24	1	-1/+1
\| \|
* \|	Merge branch '30649-update-health-check-documentation' into 'master'	Achilleas Pipinellis	2017-04-25	1	-17/+59
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Health Check Documentation Closes #30649 See merge request !10565
\| * \|	Add Health Check Documentation	Joshua Lambert	2017-04-25	1	-17/+59
\|/ /
* \|	Merge branch 'gitaly-testing-toml' into 'master'	Rémy Coutable	2017-04-25	3	-6/+42
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly testing toml Closes gitaly#182 See merge request !10605
\| * \|	Configure Gitaly through settings file instead of ENV varsgitaly-testing-toml	Alejandro Rodríguez	2017-04-18	3	-6/+42
\| \| \|
* \| \|	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 '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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|