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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Skip validation when creating internal (ghost, service desk) usersdm-fix-ghost-user-validation	Douwe Maan	2017-04-26	1	-0/+10
\|
*	Use rspec-set to speed up examples	Zeger-Jan van de Weg	2017-04-26	3	-34/+40
\|
*	Merge branch 'backport-md-cache-fix' into 'master'	Dmitriy Zaporozhets	2017-04-26	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Work around a hard-to-understand failure in `CacheMarkdownField` See merge request !10918
\| *	Fix a failing spec	Nick Thomas	2017-04-25	1	-2/+2
\| \|
* \|	Merge branch '26509-show-update-time' into 'master'	Annabel Dunstone Gray	2017-04-26	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add updated time to project list Closes #26509 See merge request !8514
\| * \|	Add updated time to project list	Jeff Stubler	2017-04-21	1	-1/+1
\| \| \|
* \| \|	Merge branch ↵	Clement Ho	2017-04-26	1	-0/+30
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22826-ui-inconsistency-different-files-views-find-file-button-missing' into 'master' [#22826] Ensure find_file_link and download button is part of file tree header Closes #22826 See merge request !9847
\| * \| \|	[#22826] Add newline before expect in accordance to four phase thoughtbot style	TM Lee	2017-04-25	1	-0/+2
\| \| \| \|
\| * \| \|	[#22826] Ensure find_file_link and download button is part of file tree header	TM Lee	2017-04-23	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move the find_file_link and download partial into the project tree_header partial - Added Changelog
* \| \| \|	Merge branch '12910-personal-snippet-prep-2' into 'master'	Sean McGivern	2017-04-26	3	-0/+38
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support preview_markdown action for personal_snippets See merge request !10810
\| * \| \| \|	Support preview_markdown action for personal_snippets	Jarka Kadlecova	2017-04-26	3	-0/+38
\| \| \| \| \|
* \| \| \| \|	Load a project's CI status in batch from redis	Bob Van Landuyt	2017-04-26	3	-21/+148
\| \| \| \| \|
* \| \| \| \|	Merge branch '26437-closed-by' into 'master'	Rémy Coutable	2017-04-26	3	-1/+42
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add issues/:iid/closed_by api endpoint Closes #26437 See merge request !10511
\| * \| \| \| \|	Add issues/:iid/closed_by api endpoint	mhasbini	2017-04-12	3	-1/+42
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'more-mr-filters' into 'master'	Sean McGivern	2017-04-26	1	-4/+68
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More merge request filters Closes #26301 See merge request !10924
\| * \| \| \| \| \|	Ability to filter merge requests by labels and milestones	Robert Schilling	2017-04-25	1	-4/+68
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'group-assignee-dropdown-send-group-id' into 'master'	Filipa Lacerda	2017-04-26	1	-0/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Assignee filter on group issues/merge requests only loads group users Closes #29490 See merge request !10884
\| * \| \| \| \| \|	Assignee filter on group issues/merge requests only loads group usersgroup-assignee-dropdown-send-group-id	Phil Hughes	2017-04-24	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #29490
* \| \| \| \| \| \|	Merge branch '20378-natural-sort-issue-numbers' into 'master'	Sean McGivern	2017-04-26	2	-5/+94
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change issues sentence to use natural sorting Closes #20378 See merge request !7110
\| * \| \| \| \| \| \|	Change issues sentence to use natural sorting	Jeff Stubler	2017-04-25	2	-5/+94
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '31280-skip-issueables-without-project' into 'master'	Sean McGivern	2017-04-26	2	-25/+56
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip issuable without a project in IssuableExtractor#extract Closes #31280 See merge request !10906
\| * \| \| \| \| \| \| \|	Follow feedback on the review	Lin Jen-Shin	2017-04-26	1	-23/+47
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Skip issuable without a project in IssuableExtractor#extract	Lin Jen-Shin	2017-04-25	2	-55/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31280
* \| \| \| \| \| \| \| \|	Ensures that OAuth/LDAP/SAML users don't need to be confirmed	Rémy Coutable	2017-04-26	3	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'mr-diff-size-overflow' into 'master'	Douwe Maan	2017-04-25	2	-18/+34
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show correct size when MR diff overflows Closes #26560 See merge request !10827
\| * \| \| \| \| \| \| \| \|	Show correct size when MR diff overflows	Sean McGivern	2017-04-25	2	-18/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The problem is that we often go via a diff object constructed from the diffs stored in the DB. Those diffs, by definition, don't overflow, so we don't have access to the 'correct' `real_size` - that is stored on the MR diff object iself.
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-fix-oauth-user-creation' into 'master'	Robert Speicher	2017-04-25	3	-0/+38
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled Closes #31294 See merge request !10896
\| * \| \| \| \| \| \| \| \|	Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creation	Douwe Maan	2017-04-24	3	-0/+38
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master'	Douwe Maan	2017-04-25	1	-9/+38
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diffs with edit-forking needs Closes #31276 See merge request !10868
\| * \| \| \| \| \| \| \| \|	Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needs	Eric Eastwood	2017-04-24	1	-9/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276
* \| \| \| \| \| \| \| \| \|	Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master'	Sean McGivern	2017-04-25	4	-4/+18
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't display the `is_admin?` flag for user API responses Closes #29903 See merge request !10846
\| * \| \| \| \| \| \| \| \|	Don't display the `is_admin?` flag for user API responses.	Timothy Andrew	2017-04-25	4	-4/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- To prevent an attacker from enumerating the `/users` API to get a list of all the admins. - Display the `is_admin?` flag wherever we display the `private_token` - at the moment, there are two instances: - When an admin uses `sudo` to view the `/user` endpoint - When logging in using the `/session` endpoint
* \| \| \| \| \| \| \| \| \|	Merge branch 'gitaly-testing-toml' into 'master'	Rémy Coutable	2017-04-25	1	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'use-jquery-on-blob-fork-suggestion' into 'master'	Jacob Schatz	2017-04-24	1	-15/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-15/+16
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add aria to icon See merge request !10670
\| * \| \| \| \| \| \| \| \| \|	Improve specsadd-aria-to-icon	Clement Ho	2017-04-24	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add tests	Clement Ho	2017-04-18	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master'	Sean McGivern	2017-04-24	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+8
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	discussion ID
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'notebooklab-in-repo' into 'master'	Jacob Schatz	2017-04-24	8	-1/+417
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved NotebookLab assets into repo See merge request !10630
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into notebooklab-in-reponotebooklab-in-repo	Phil Hughes	2017-04-13	10	-97/+223
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into notebooklab-in-repo	Phil Hughes	2017-04-13	29	-328/+1048
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Pull in fixture files from the repo	Phil Hughes	2017-04-11	6	-7/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Moved NotebookLab assets into repo	Phil Hughes	2017-04-11	6	-0/+374
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved all the notebooklab assets into the GitLab repo
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master'	Sean McGivern	2017-04-24	1	-0/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+15
\| \| \|_\|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master'	Sean McGivern	2017-04-24	1	-7/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-7/+2
\| \|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	longer in the diff