234 Commits

Include renames

Author	SHA1	Message	Date
Douwe Maan	822ba95f75	Merge branch 'fix-commit-data-url-generation' into 'master' ... Fix bug where commit data would not appear in some subdirectories Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example: https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix) The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior. * Closes #1478, #1459 * Closes https://github.com/gitlabhq/gitlabhq/issues/9037 See merge request !581	2015-04-28 15:46:36 +00:00
Jakub Jirutka	a1c01bc19b	Fix (project_)name_regex to accept non-ASCII letters and dash	2015-04-27 16:38:47 +02:00
Stan Hu	ef0055b52d	Fix bug where commit data would not appear in some subdirectories ... The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a tree to be escaped automatically. Using wildcard globs prevents this behavior. Closes #1478, #1459	2015-04-26 23:52:40 -07:00
Robert Speicher	07a88040a4	Fix NotificationService spec	2015-04-25 16:46:06 -04:00
Robert Speicher	95ca6584d8	Add CommitRange directly to results Hash	2015-04-25 14:46:06 -04:00
Robert Speicher	6bac823ad4	Update CommitRangeReferenceFilter to use CommitRange class ... Also matches CommitReferenceFilter's new behavior of always using short SHAs in the link text.	2015-04-25 14:41:06 -04:00
Robert Speicher	2c8bfedb20	Always use short SHAs as commit reference link text ... Now when a user pastes a full SHA like `d7f61affaf845f44b4cc995e34eb1606c47c8eff`, its link text will only show `d7f61aff` for brevity.	2015-04-25 14:40:40 -04:00
Robert Speicher	8f8a8ab32b	Refactor ReferenceExtractor to use pipeline filters	2015-04-25 14:40:12 -04:00
Robert Speicher	a6defd1576	Add results to reference filters	2015-04-25 14:39:45 -04:00
Douwe Maan	8ed7ac9d44	Use project.commit convenience method.	2015-04-24 12:29:36 +02:00
Robert Speicher	4ced630fed	Add Gitlab::Markdown::EmojiFilter	2015-04-21 12:53:42 -04:00
Dmitriy Zaporozhets	2cd501f7e4	Merge branch 'rs-reference-filters' into 'master' ... Convert GFM reference handling to html-pipeline filters - `Gitlab::Markdown` is now much cleaner - Better separation of concerns - Cleaner, less brittle, more maintainable specs for each reference type. - Label references actually work! See merge request !1753	2015-04-21 16:43:54 +00:00
Douwe Maan	0c650dc0e2	Update Google Code importer test.	2015-04-21 10:36:43 +02:00
Robert Speicher	b389424627	Skip failing test until usernames can't end in periods again	2015-04-20 13:01:47 -04:00
Douwe MaanandRobert Speicher	c52bf4ad3c	Tweak single-word label regex to fix pending spec.	2015-04-20 13:01:47 -04:00
Douwe MaanandRobert Speicher	b5802d144b	project_from_ref returns nil when reference doesn't exist.	2015-04-20 13:01:47 -04:00
Robert Speicher	2823c058d8	project_from_ref returns nil when reference can't be accessed ... Prior it would return the project from the current context, which wasn't the intended behavior.	2015-04-20 13:01:47 -04:00
Robert Speicher	3a0b4340aa	Add more tests for cross-project references	2015-04-20 13:01:46 -04:00
Robert Speicher	b905702d4f	Escape title attributes in references	2015-04-20 13:01:46 -04:00
Robert Speicher	a3c71d9898	Add spec for ReferenceExtractor#labels	2015-04-20 13:01:46 -04:00
Robert Speicher	5b6c1a2182	Fix Issue and ExternalIssue reference specs	2015-04-20 13:01:45 -04:00
Robert Speicher	b0ea7b3b3d	Fix cross-project reference specs for new permission check ... For simplicity's sake, since we're testing the actual referencing, we just force the permission check to always be allowed.	2015-04-20 13:01:44 -04:00
Robert Speicher	a803cd51eb	Check for project read permissions in cross-references	2015-04-20 13:01:44 -04:00
Robert Speicher	29604ff2c3	Add permission checking to UserReferenceFilter	2015-04-20 13:01:43 -04:00
Robert Speicher	189c5347be	Add name-based referencing to LabelReferenceFilter	2015-04-20 13:01:43 -04:00
Robert Speicher	bc7c35cca0	Fix ReferenceExtractor spec	2015-04-20 13:01:43 -04:00
Robert Speicher	4cb1cc2b64	Make CommitRange and Snippets cross-referable	2015-04-20 13:01:42 -04:00
Robert Speicher	d520fe07ad	Fix GitlabMarkdownHelper spec	2015-04-20 13:01:42 -04:00
Robert Speicher	96c2b94048	Reference filters ✨ ... Commit ranges, commits, external issues, issues, labels, merge requests, snippets, users.	2015-04-20 13:01:42 -04:00
Douwe Maan	7d98c8842d	Move import data out of project so it doesn't take ages to load.	2015-04-17 14:49:00 +02:00
Douwe Maan	80097606f5	Make sure user has access to namespace in import tests.	2015-04-15 16:58:43 +02:00
Dmitriy Zaporozhets	345e32d332	Merge branch 'sstanovnik-openssh_fix' into 'master' ... Fix generating SSH key fingerprints with OpenSSH 6.8. Replaces https://github.com/gitlabhq/gitlabhq/pull/9008. Fixes gitlab-org/gitlab-ce#1289. cc @jacobvosmaer See merge request !519	2015-04-15 12:40:30 +00:00
Dmitriy Zaporozhets	4ab22a8c32	Merge branch 'ldap-block_auto_created_users' into 'master' ... Add config var to block auto-created LDAP users. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2110. See merge request !522	2015-04-15 12:36:43 +00:00
Douwe Maan	63b21945d2	Merge branch 'google-code-import' into 'master' ... Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( ♥️ @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions  ### Imported issue  See merge request !471	2015-04-15 06:53:42 +00:00
Douwe Maan	9d00bb0896	Import Google Code issue assignee when mapped.	2015-04-14 23:22:14 +02:00
Douwe Maan	238e4f0295	Add config var to block auto-created LDAP users.	2015-04-14 17:09:05 +02:00
Douwe Maan	dba63d667d	Allow user map to be specified.	2015-04-14 14:50:56 +02:00
Douwe Maan	f6cb42f3d1	Add comment number to imported Google Code comments.	2015-04-14 13:13:18 +02:00
Douwe Maan	dfe659c16d	Remove author link since all code.google.com links will be shut down.	2015-04-14 13:11:29 +02:00
Douwe Maan	1221bec56c	Refactor key fingerprint generation.	2015-04-14 12:00:43 +02:00
Dmitriy Zaporozhets	4ab717ea6a	Merge branch 'ldap_migration' ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb	2015-04-13 17:18:02 +03:00
Dmitriy Zaporozhets	ecb58dacd6	Merge branch 'reference-access-control' into 'master' ... Only allow users to reference groups, projects, issues, MRs, commits they have access to. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183. See merge request !1742	2015-04-13 14:10:25 +00:00
Jacob Vosmaer	65a3928b0b	Remove test for 'ldap' provider special case	2015-04-13 12:58:10 +02:00
Robert Speicher	2cefdbb535	Move lib/gitlab/oauth to lib/gitlab/o_auth ... Lets Rails autoload these files by name	2015-04-09 14:19:24 -04:00
Douwe Maan	06399b3261	Show Google Code image attachments inline.	2015-04-04 14:19:05 +02:00
Douwe Maan	16e1076e6f	Update tests.	2015-04-03 18:03:34 +02:00
Douwe Maan	e8fb197da2	Fix tests.	2015-04-03 17:09:15 +02:00
Douwe Maan	7b5bc32cad	Allow projects to be imported from Google Code.	2015-04-03 15:29:27 +02:00
Douwe Maan	317206300d	Merge branch 'configurable-attachment-size' into 'master' ... Support configurable attachment size in Application Settings page ### What does this MR do? This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page. ### Are there points in the code the reviewer needs to double check? What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid. ### Why was this MR needed? We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? See Issue #1258 ### Screenshots Before:  After:  See merge request !407	2015-04-03 08:47:55 +00:00
Douwe Maan	c5d7660000	Fix errors.	2015-04-02 22:36:54 +02:00