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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Streamline the path validation in groups & projects	Bob Van Landuyt	2017-05-01	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|	`Project` uses `ProjectPathValidator` which is now a `NamespaceValidator` that skips the format validation. That way we're sure we are using the same collection of reserved paths. I updated the path constraints to reflect the changes: We now allow some values that are only used on a top level namespace as a name for a nested group/project.
*	Merge branch 'enable-spec-file-name-cop' into 'master'	Robert Speicher	2017-04-28	9	-122/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Enable RSpec/FilePath cop Closes #31316 See merge request !10911
\| *	Enable RSpec/FilePath copenable-spec-file-name-cop	Sean McGivern	2017-04-26	9	-122/+3
\| \| \| \| \| \| \| \| \| \| \| \|	- Ignore JS fixtures - Ignore qa directory - Rewrite concern specs to put concern name first
* \|	Merge branch 'remove-invalid-services' into 'master'	Douwe Maan	2017-04-27	2	-23/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove invalid services with nil or empty type See merge request !10847
\| * \|	tadds migration to remove invalid services	Tiago Botelho	2017-04-27	2	-23/+20
\| \| \|
* \| \|	Merge branch '30973-fix-network-graph-ordering' into 'master'	Douwe Maan	2017-04-27	1	-0/+29
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ordering of commits in the network graph. Closes #30973 See merge request !10936
\| * \| \|	Fix ordering of commits in the network graph.	Timothy Andrew	2017-04-27	1	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1 - Prior to this upgrade, the default sort order for commits returned by `Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the graph relied on. - While upgrading `rugged`, the MR also changed this default to `Rugged::SORT_NONE`, which broke commit ordering in the graph. - This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort by date, and changes the graph builder `Network::Graph` so it explictly requests the `:date` sort order
* \| \| \|	Remove unused optional parameter `asciidoc_opts`	Toon Claes	2017-04-27	1	-19/+2
\| \| \| \|
* \| \| \|	Fix failing specs	Toon Claes	2017-04-27	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'	Sean McGivern	2017-04-27	1	-2/+8
\|\ \ \ \
\| * \| \| \|	Fix rendering emoji inside a string	blackst0ne	2017-04-25	1	-2/+8
\| \| \| \| \|
* \| \| \| \|	Load a project's CI status in batch from redis	Bob Van Landuyt	2017-04-26	1	-14/+128
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge branch '20378-natural-sort-issue-numbers' into 'master'	Sean McGivern	2017-04-26	1	-0/+62
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+62
\| \| \| \| \|
* \| \| \| \|	Merge branch '31280-skip-issueables-without-project' into 'master'	Sean McGivern	2017-04-26	1	-25/+52
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-55/+58
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	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>
* \| \| \|	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 '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
* \| \| \|	Merge branch '30305-oauth-token-push-code' into 'master'	Rémy Coutable	2017-04-24	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow OAuth clients to push code Closes #30305 See merge request !10677
\| * \| \| \|	Allow OAuth clients to push code30305-oauth-token-push-code	Timothy Andrew	2017-04-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- We currently support fetching code with username = 'oauth2' and password = <access_token>. - Trying to _push_ code with the same credentials fails with an authentication error. - There's no reason this shouldn't be enabled, especially since we allow the OAuth client to create deploy keys with push access: https://docs.gitlab.com/ce/api/deploy_keys.html#add-deploy-key
* \| \| \| \|	Merge branch 'dz-fix-spec-filenames-ce' into 'master'	Sean McGivern	2017-04-24	1	-1/+3
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect spec filenames which were ingored by CI See merge request !10875
\| * \| \| \|	Fix outdated specs that were not executed due to wrong filename	Dmitriy Zaporozhets	2017-04-24	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix incorrect spec filenames which were ingored by CIdz-fix-spec-filenames-ce	Dmitriy Zaporozhets	2017-04-24	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch '30672-versioned-markdown-cache' into 'master'	Douwe Maan	2017-04-21	2	-55/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Start versioning cached markdown fields Closes #30672 See merge request !10597
\| * \| \| \| \|	Start versioning cached markdown fields	Nick Thomas	2017-04-21	2	-55/+18
\| \|/ / / /
* \| \| \| \|	Merge branch 'sh-fix-issue-31215-2' into 'master'	Douwe Maan	2017-04-21	1	-0/+25
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Based on !10841 Fix Error 500 when referencing issue with project in pending delete Closes #31215 See merge request !10843
\| * \| \| \|	Also test against external-issue for deleted projects	Lin Jen-Shin	2017-04-21	1	-5/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is based on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10841
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into sh-fix-issue-31215	Lin Jen-Shin	2017-04-21	8	-67/+320
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (109 commits) Update CI templates to include 9.1 templates Change spec folder to match the assets one Update style_guide_js.md Milestones documentation refactor Adds documentation entry: Don't user forEach, aim for code without side effects Move kube namespace section to the variables one Changed milestone.to_reference calls into milestone.title for the show, edit and top views Update move icon to match others Issue Title Show Focus Check On Load Update Kubernetes namespace documentation Store projects in metrics for email replies Refactor into .vue files Adds vue js example application and documentation Add ES lint support to identify poorly written Promises Update plantuml.md to add the actual link. Fixed wording Add metrics events for incoming emails Remove helpers assigned_issuables_count and cached_assigned_issuables_count Refactor into .vue files part 2 Fix headings ...
\| * \| \| \| \|	Fix Error 500 when referencing issue with project in pending deletesh-fix-issue-31215	Stan Hu	2017-04-20	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31215
* \| \| \| \| \|	Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING ↵fix/encoding-issue	James Lopez	2017-04-20	1	-0/+4
\| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	error
* \| \| \| \|	Merge branch 'issuable-state-custom-links' into 'master'	Sean McGivern	2017-04-20	1	-32/+76
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not append issuable state to links with custom anchor Closes #30916 See merge request !10782
\| * \| \| \| \|	Do not append issuable state to links with custom anchorissuable-state-custom-links	Adam Niedzielski	2017-04-19	1	-32/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #30916 Change the presentation from [closed] to (closed)
* \| \| \| \| \|	Merge branch 'plantuml-filter-after-highlight' into 'master'	Sean McGivern	2017-04-20	1	-4/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix PlantUML integration in GFM Closes #30557 See merge request !10651
\| * \| \| \| \| \|	Fix PlantUML integration in GFMplantuml-filter-after-highlight	Adam Niedzielski	2017-04-19	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #30557 Use "lang" attribute instead of "class" in PlantumlFilter.
* \| \| \| \| \| \|	Refactor changing files in web UI	Douwe Maan	2017-04-20	4	-17/+19
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issuable-state-only-notes-and-description' into 'master'	Sean McGivern	2017-04-19	1	-11/+21
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display issuable state only in notes and issuable description Closes #30964 See merge request !10789
\| * \| \| \| \|	Display issuable state only in notes and issuable description	Adam Niedzielski	2017-04-19	1	-11/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #30964
* \| \| \| \| \|	Merge branch 'usage-ping-port' into 'master'	Sean McGivern	2017-04-19	2	-0/+197
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Usage ping port Closes #27750 See merge request !10481
\| * \| \| \| \|	Remove unused user activities code	Sean McGivern	2017-04-14	1	-155/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Add a new Gitlab::UserActivities class to track user activities	Rémy Coutable	2017-04-14	3	-91/+127
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This new class uses a Redis Hash instead of a Sorted Set. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Port 'Add user activities API' to CE	Sean McGivern	2017-04-14	3	-0/+246
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962
\| * \| \| \| \|	Add prometheus services to usage ping	Sean McGivern	2017-04-14	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add edition to usage ping	Sean McGivern	2017-04-14	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add Upload count to usage data	Robert Speicher	2017-04-14	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Port 'Add uuid to usage ping' to CE	Sean McGivern	2017-04-14	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1521
\| * \| \| \| \|	Track Mattermost usage	Z.J. van de Weg	2017-04-14	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove pushes count from usage ping payload	Ruben Davila	2017-04-14	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This query is constantly generating timeout errors on large installations and we don't have a simple solution for now and also we don't think having this counter is really critical.