home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,127 Commits 48 Branches 340 Tags
2144cc710a8aec35e8f0bfee8d398d884b9bb523
Commit Graph
184 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 644b4c97e9 Merge pull request #8756 from zaburt/force_utf8_on_oauth_properties 
add common method to force utf8 and force oauth properties to be utf8
 2015-05-03 14:25:36 +03:00
Onur Küçük 0ae574007d add common method to force utf8 and force oauth properties to be utf8 2015-05-03 00:43:46 +03:00
Robert Speicher 0027c2ddd7 Add Project#get_issue 2015-04-30 16:35:27 -04:00
Robert Speicher cd3c24a8f3 Autolink short URLs 2015-04-30 16:35:27 -04:00
Robert Speicher f4fac3ac87 Add jira_project project factory 2015-04-30 16:35:27 -04:00
Robert Speicher e46d1cdd8b Add Gitlab::Markdown::SanitizationFilter 
This just extends the HTML::Pipeline::SanitizationFilter with our custom
whitelist.
 2015-04-30 16:35:25 -04:00
Robert Speicher aa2cc670fe Add Gitlab::Markdown::AutolinkFilter 2015-04-30 16:35:25 -04:00
Robert Speicher 382a0aa6ef Add Gitlab::Markdown::TableOfContentsFilter 
Removes header and table of contents processing from Redcarpet renderer.
 2015-04-30 16:35:25 -04:00
Stan Hu 9c76a6fa96 Show incompatible projects in Google Code import status 
Importing a JSON file with only one Subversion project lead to confusion
over whether the system was working. Provide status why these projects
could not be imported directly.

Closes #1531
 2015-04-30 06:56:49 -07:00
Jakub Jirutka a1c01bc19b Fix (project_)name_regex to accept non-ASCII letters and dash 2015-04-27 16:38:47 +02: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

![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png)

### Imported issue

![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png)

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