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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed commit icon size in cycle analyitcscycle-analytics-commit-icon	Phil Hughes	2017-03-16	1	-6/+4
\| \| \| \|	Closes #29536
*	Merge branch 'fix-project-without-repo-and-wiki' into 'master'	Rémy Coutable	2017-03-16	2	-2/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix projects without repo and wiki Closes #29542 See merge request !9956
\| *	Expect @issuable_meta_data to be set, feedback:fix-project-without-repo-and-wiki	Lin Jen-Shin	2017-03-16	1	-0/+1
\| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9956#note_25445832
\| *	Fix projects without repo and wiki	Lin Jen-Shin	2017-03-15	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When repo and wiki are disabled for a project, we're showing issues so we'll need to set @issuable_meta_data otherwise it would be giving nil errors. See: https://sentry.gitlap.com/gitlab/staginggitlabcom/issues/23106/
* \|	Merge branch 'pipeline-tooltips-overflow' into 'master'	Filipa Lacerda	2017-03-16	2	-0/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed pipeline action tooltips being cut off Closes #29314 See merge request !9960
\| * \|	Fixed pipeline action tooltips being cut offpipeline-tooltips-overflow	Phil Hughes	2017-03-15	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed the container for the tooltip to be the body so that the tooltip does not get cut off with the overflow area. This change affects both merge request pipelines table & the pipelines page Closes #29314
* \| \|	Merge branch '28494-mini-pipeline-graph-commit-view' into 'master'	Jacob Schatz	2017-03-16	9	-10/+127
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds pipeline mini-graph to system information box in Commit View Closes #28494 See merge request !9902
\| * \| \|	Adds pipeline mini-graph to system information box in Commit View	Filipa Lacerda	2017-03-16	9	-10/+127
\| \| \| \|
* \| \| \|	Merge branch 'dm-fix-mailroom-config' into 'master'	DJ Mountney	2017-03-16	3	-58/+70
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix reply by email by fixing config/mail_room.yml to be interpretable without ActiveSupport See merge request !9979
\| * \| \|	Fix redis spec	Douwe Maan	2017-03-15	2	-33/+31
\| \| \| \|
\| * \| \|	Fix config/mail_room.yml to be interpretable Ruby	Douwe Maan	2017-03-15	1	-0/+1
\| \| \| \|
\| * \| \|	Verify config/mail_room.yml is interpretable Ruby	Douwe Maan	2017-03-15	2	-27/+40
\| \| \| \|
* \| \| \|	Merge branch 'group-gear-setting-dropdown-to-tab' into 'master'	Douwe Maan	2017-03-16	6	-20/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the gear settings dropdown in the group view to a tab Closes #23304 See merge request !9882
\| * \| \| \|	Changed "Edit Group" subtab to "General" and moved itgroup-gear-setting-dropdown-to-tab	Jose Ivan Vargas	2017-03-15	2	-11/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to the first option inside said subtab. Also code cleanup
\| * \| \| \|	Fixed some missing permission conditions	Jose Ivan Vargas	2017-03-14	2	-11/+12
\| \| \| \| \|
\| * \| \| \|	Fixed haml_lint warning for the settings_head partial	Jose Ivan Vargas	2017-03-14	2	-2/+1
\| \| \| \| \|
\| * \| \| \|	Moved the gear settings dropdown in the group view to a tab	Jose Ivan Vargas	2017-03-14	6	-19/+28
\| \| \| \| \|
* \| \| \| \|	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]