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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix specadd-blob-copy-button	Douwe Maan	2017-03-16	2	-3/+3
\|
*	Use code icon for Raw	Douwe Maan	2017-03-16	1	-1/+1
\|
*	Fix spec	Douwe Maan	2017-03-16	12	-76/+97
\|
*	Add copy button to blob header and use icon for Raw button	Douwe Maan	2017-03-16	2	-4/+10
\|
*	Merge branch 'rs-revert-notified-of-own-activity-migration' into 'master'	Robert Speicher	2017-03-15	2	-1/+25
\|\ \| \| \| \| \| \| \| \|	Revert the AddNotifiedOfOwnActivityToUsers migration See merge request !9973
\| *	Revert the AddNotifiedOfOwnActivityToUsers migrationrs-revert-notified-of-own-activity-migration	Robert Speicher	2017-03-15	2	-1/+25
\|/
*	Merge branch '8836-mr-revert' into 'master'	Robert Speicher	2017-03-15	10	-168/+6
\|\ \| \| \| \| \| \| \| \|	Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master' See merge request !9974
\| *	Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'	Stan Hu	2017-03-15	10	-168/+6
\| \| \| \| \| \| \| \| \| \|	This reverts commit 5e9666880376b3f53edb95cba77b5642d3cc1810, reversing changes made to b35378a938e22f745b6c6ea32b53cb50f9b6c627.
* \|	Merge branch 'docs/add-missing-steps-in-pages-source-install' into 'master'	Robert Speicher	2017-03-15	1	-20/+62
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing steps of Pages source installation Closes #29372 [ci skip] See merge request !9923
\| * \|	Bump pages daemon to 0.4.0docs/add-missing-steps-in-pages-source-install	Achilleas Pipinellis	2017-03-14	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Add missing steps of Pages source installation	Achilleas Pipinellis	2017-03-14	1	-20/+62
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'add_quick_submit_for_snippet_forms' into 'master'	Clement Ho	2017-03-15	2	-1/+5
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add quick submit for snippet forms Closes #27534 See merge request !9911
\| * \|	Add quick submit for snippet forms	blackst0ne	2017-03-14	2	-1/+5
\| \| \|
* \| \|	Merge branch 'better-priority-sorting' into 'master'	Douwe Maan	2017-03-15	25	-27/+213
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better priority sorting Closes #28754 See merge request !9938
\| * \| \|	Allow filtering by all started milestonesbetter-priority-sorting	Sean McGivern	2017-03-15	15	-12/+107
\| \| \| \|
\| * \| \|	Allow sorting by due date and label priority	Sean McGivern	2017-03-15	10	-15/+106
\| \| \| \|
* \| \| \|	Merge branch 'revert-e52529e2' into 'master'	Sean McGivern	2017-03-15	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'google-protobuf-3.2.0.1' into 'master'" See merge request !9971
\| * \| \| \|	Revert "Merge branch 'google-protobuf-3.2.0.1' into 'master'"	Rémy Coutable	2017-03-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !9932
* \| \| \| \|	Merge branch '27174-filter-filters' into 'master'	Clement Ho	2017-03-15	5	-16/+53
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prevent filtering Issues by multiple milestones, authors, or assignees Closes #27174 See merge request !9406
\| * \| \| \| \|	prevent filtering Issues by multiple milestones, authors, or assignees27174-filter-filters	Simon Knox	2017-03-11	5	-16/+53
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-copy-code-as-gfm' into 'master'	Sean McGivern	2017-03-15	12	-368/+559
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy code as GFM from diffs, blobs and GFM code blocks See merge request !9874
\| * \| \| \| \| \|	Remove selectionToGFMdm-copy-code-as-gfm	Douwe Maan	2017-03-14	2	-9/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix specs	Douwe Maan	2017-03-14	7	-24/+24
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Document tag option and clarify spec	Douwe Maan	2017-03-14	2	-5/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Copy code as GFM from diffs, blobs and GFM code blocks	Douwe Maan	2017-03-14	6	-343/+537
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'filter-search-scrollbar' into 'master'	Clement Ho	2017-03-15	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't show scrollbar on search field unless necessary See merge request !9880
\| * \| \| \| \| \|	don't show scrollbar on search field unless necessaryfilter-search-scrollbar	Simon Knox	2017-03-11	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '27271-missing-time-spent-in-issue-webhook' into 'master'	Douwe Maan	2017-03-15	5	-3/+31
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include time tracking attributes in webhooks payload Closes #27271 See merge request !9942
\| * \| \| \| \| \| \|	Include time tracking attributes in webhooks payload27271-missing-time-spent-in-issue-webhook	Ruben Davila	2017-03-14	5	-3/+31
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'issue_29449' into 'master'	Rémy Coutable	2017-03-15	2	-5/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove whitespace in group links Closes #29449 See merge request !9947
\| * \| \| \| \| \| \| \|	Remove whitespace in group links	Xurxo	2017-03-15	2	-5/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'allow-resolving-conflicts-in-utf-8' into 'master'	Robert Speicher	2017-03-15	3	-35/+66
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow resolving conflicts with non-ASCII chars Closes #26214 See merge request !9937
\| * \| \| \| \| \| \|	Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8	Sean McGivern	2017-03-15	3	-35/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We wanted to check that the text could be encoded as JSON, because conflict resolutions are passed back and forth in that format, so the file itself must be UTF-8. However, all strings from the repository come back without an encoding from Rugged, making them ASCII_8BIT. We force to UTF-8, and reject if it's invalid. This still leaves the problem of a file that 'looks like' UTF-8 (contains valid UTF-8 byte sequences), but isn't. However: 1. If the conflicts contain the problem bytes, the user will see that the file isn't displayed correctly. 2. If the problem bytes are outside of the conflict area, then we will write back the same bytes when we resolve the conflicts, even though we though the encoding was UTF-8.
* \| \| \| \| \| \| \|	Merge branch 'docs/nested-groups' into 'master'	Achilleas Pipinellis	2017-03-15	7	-0/+166
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add nested groups documentation Closes #28761 See merge request !9783
\| * \| \| \| \| \| \| \|	Change naming from nested groups to subgroupsdocs/nested-groups	Achilleas Pipinellis	2017-03-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Address subgroups docs review	Achilleas Pipinellis	2017-03-14	1	-47/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Fix wording	Achilleas Pipinellis	2017-03-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Add info on group membership	Achilleas Pipinellis	2017-03-14	1	-10/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Add nested groups documentation	Achilleas Pipinellis	2017-03-14	7	-0/+155
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch '28277-document-u2f-limitations-with-multiple-urls' into 'master'	Achilleas Pipinellis	2017-03-15	2	-0/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Document U2F limitations with multiple URLs" Closes #28277 See merge request !9300
\| * \| \| \| \| \| \| \|	Document U2F limitations with multiple hostnames/FQDNs.28277-document-u2f-limitations-with-multiple-urls	Timothy Andrew	2017-02-25	2	-0/+15
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue-boards-docs' into 'master'	Achilleas Pipinellis	2017-03-15	1	-2/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added issue boards re-ordering docs See merge request !9924
\| * \| \| \| \| \| \| \| \|	Added issue boards re-ordering docs	Phil Hughes	2017-03-15	1	-2/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-milestone-name-on-show' into 'master'	Rémy Coutable	2017-03-15	3	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo on Milestones show page. Fixes #29214 Closes #29214 See merge request !9913
\| * \| \| \| \| \| \| \| \| \|	Switch to using milestone.to_reference when displaying milestone Fix #29214	Raveesh	2017-03-14	3	-2/+6
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-polling-doc' into 'master'	Sean McGivern	2017-03-15	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in doc/development/polling.md: `If-None-Modified` -> `If-None-Match` See merge request !9957
\| * \| \| \| \| \| \| \| \| \|	Fix typo in doc/development/polling.md: `If-None-Modified` -> `If-None-Match`fix-polling-doc	Rémy Coutable	2017-03-15	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \|	Merge branch '27551-use-dev-mirror-of-gitlab-git-test-on-dev' into 'master'	Sean McGivern	2017-03-15	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different gitlab-git-test repo Closes #27551 See merge request !9945
\| * \| \| \| \| \| \| \| \| \| \|	Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different ↵27551-use-dev-mirror-of-gitlab-git-test-on-dev	Rémy Coutable	2017-03-14	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab-git-test repo We will set this to the dev mirror in GitLab CE and EE on dev. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-dropdown-author-spec-speed' into 'master'	Rémy Coutable	2017-03-15	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up the issues/filtered_search/dropdown_author feature spec See merge request !9951