home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,711 Commits 48 Branches 340 Tags
a3c71d9898ac762ebec8800a68f8aaae7671773c
Commit Graph
15711 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher a3c71d9898 Add spec for ReferenceExtractor#labels 2015-04-20 13:01:46 -04:00
Robert Speicher 31172475d2 Better guard against nil projects in ReferenceFilter 2015-04-20 13:01:46 -04:00
Robert Speicher 9eaaa7cdef Minor doc fix 
[ci skip]
 2015-04-20 13:01:45 -04:00
Robert Speicher 5b6c1a2182 Fix Issue and ExternalIssue reference specs 2015-04-20 13:01:45 -04:00
Robert Speicher b3b8fc6c8a DRY up reference filters using ReferenceFilter base class 2015-04-20 13:01:45 -04:00
Robert Speicher 6189b24fdd Add a ReferenceFilter base class 
This will allow for the removal of a lot of duplication from the
reference filters.
 2015-04-20 13:01:45 -04:00
Robert Speicher c4eb6a55f1 Fix user_can_reference_group? check 2015-04-20 13:01:45 -04:00
Robert Speicher 52909f8bdb Add permission check to ReferenceExtractor's user mentions 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 62282971e0 Rename user_can_read_group? to user_can_reference_group? 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 470b0c2508 Remove more now-invalid specs 2015-04-20 13:01:44 -04:00
Robert Speicher 4d3a634ece Fix broken spec 2015-04-20 13:01:44 -04:00
Robert Speicher b41eb34503 Re-arrange spec/helpers/gitlab_markdown_helper_spec a bit 2015-04-20 13:01:44 -04:00
Robert Speicher f76df89058 Begin cleaning out spec/helpers/gitlab_markdown_helper_spec 2015-04-20 13:01:44 -04:00
Robert Speicher 34a23bda60 Add current_user to filter context 2015-04-20 13:01:43 -04:00
Robert Speicher 43c62ca3f2 Remove Gitlab::Markdown from Gitlab::ReferenceExtractor 2015-04-20 13:01:43 -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 c1c1ef52c3 Remove duplicate ampersand from Label title format validator 2015-04-20 13:01:43 -04:00
Robert Speicher bc7c35cca0 Fix ReferenceExtractor spec 2015-04-20 13:01:43 -04:00
Robert Speicher 77a6746a75 Run SanitizationFilter before our reference filters 2015-04-20 13:01:42 -04:00
Robert Speicher 02809e1cf8 Add more GFM reference examples to docs 2015-04-20 13:01:42 -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
Dmitriy Zaporozhets 76aade28e2 Merge pull request #9075 from Soullivaneuh/bootlint 
Bootlint integration
 2015-04-20 16:03:43 +03:00
Dmitriy Zaporozhets a4006a6b48 Merge branch 'better-commit-mentions' into 'master' 
Clean up code around commit mentions.

Builds upon !527.

See merge request !528
 2015-04-20 12:42:31 +00:00
Dmitriy Zaporozhets d9f7499046 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-20 15:29:11 +03:00
Dmitriy Zaporozhets 91672f4f0f Merge branch 'revert-username-period' into 'master' 
Revert disallowing usernames to end in period.

cc @JobV @jacobvosmaer

See merge request !545
 2015-04-20 12:28:17 +00:00
Jeroen van Baarsen 2006b90805 Merge pull request #9100 from bbodenmiller/patch-3 
improve new project options
 2015-04-20 13:30:57 +02:00
Douwe Maan c75c6b840b Revert disallowing usernames to end in period. 2015-04-20 12:41:44 +02:00
Ben Bodenmiller 47769bfd59 improve new project options 
* Simplify new repo commands
* Include directions for how to add an existing folder that is either
already a repo or not yet a repo

Replaces #7918.
 2015-04-20 03:13:39 -07:00
Dmitriy Zaporozhets 41f01dd3f4 Merge branch 'haynes/gitlab-ce-remove_access_control_for_images' into 'master' 
Remove access control for uploaded images to fix broken images in emails

Replaces !530.

> This MR removes the access control for uploaded images. This is needed to display the images in emails again.
>
> The previous solution to base64 encode the images had to be reverted, because not all email clients supported it.
>
> If possible this should go into the 7.10 release.

See merge request !533
 2015-04-20 09:43:01 +00:00
Dmitriy Zaporozhets 457efe2446 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-20 12:36:41 +03:00
Dmitriy Zaporozhets 61ebd14d5d Merge branch 'gitlab_git-7.1.10' into 'master' 
Ignore submodules that are defined in .gitmodules but are checked in as directories.

Pulls in gitlab_git 7.1.10 which contains gitlab-org/gitlab_git!26.

Fixes #1439 and https://github.com/gitlabhq/gitlabhq/issues/9140

See merge request !540
 2015-04-20 09:34:54 +00:00
Dmitriy Zaporozhets 4bd5aa26ca Merge pull request #9156 from hellerve/master 
Fixed typo in deploy html
 2015-04-20 12:28:29 +03:00
Jeroen van Baarsen 4f349fcb69 Merge pull request #9150 from digitalmediacenter/master 
do not prepend relative_url_root to avatar
 2015-04-20 11:01:59 +02:00
Dmitriy Zaporozhets 0e9d52f33d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-20 11:40:55 +03:00
Dmitriy Zaporozhets bd97715a57 Merge branch 'fix-label-color' into 'master' 
Parse GFM references after sanitizing

Parse GFM references - labels, issues, MRs, etc. - after calling the HTML Pipeline `SanitizationFilter` so that we can use non-whitelisted attributes like `style`.  See #2188.

See merge request !1745
 2015-04-20 08:40:13 +00:00
hellerve 0afccd1dd8 Fixed typo in deploy html 2015-04-20 10:38:38 +02:00
Dmitriy Zaporozhets d012648b49 Merge branch 'fix-label-color-input' into 'master' 
Fix label color input.

Because `value` was set, every label color would render as purple in the form.

Introduced by 83b5a9ae2b between 7.9 and 7.10, so no changelog item.

See merge request !538
 2015-04-20 08:30:05 +00:00
Leo Antunes f2a817f040 do not prepend relative_url_root to avatar 
The commit.author.icon variable contains a full URL, which gets broken
when prepended by the relative_url_root setting (generating hrefs like
"/gitlabhttps://...".
 2015-04-20 09:52:03 +02:00
Marin Jankovski e883aae0e7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-20 09:43:37 +02:00
Marin Jankovski 225b43de22 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-20 09:43:28 +02:00
Dmitriy Zaporozhets 41b45ece99 Merge branch 'rs-issue-2219' into 'master' 
Let Bootstrap's tab JS handle history

Closes #2219

See merge request !1784
 2015-04-19 16:30:26 +00:00
Dmitriy Zaporozhets 359f01c9e0 Merge branch 'rs-issue-2212' into 'master' 
Revert and re-fix image rendering in help pages

Closes #2212

See merge request !1765
 2015-04-19 16:24:17 +00:00
Vinnie Okada df9a992c15 Fix GFM extractions 
Extract and re-insert links after sanitizing user markup.
 2015-04-17 20:39:38 -06:00
Patricio Cano f66360859e Merge branch 'add_section_on_SSH_documentation' into 'master' 
Add the text "Add your ssh key to an application" with link to http://wiki.eclip…

…se.org/EGit/User_Guide#Eclipse_SSH_Configuration

Add text "Add your ssh key to an application" with link to http://wiki.eclipse.org/EGit/User_Guide#Eclipse_SSH_Configuration
Add on document http://doc.gitlab.com/ce/ssh/README.html

Reference:
https://twitter.com/elraro21/status/585146770709151747

See merge request !1774
 2015-04-17 22:17:19 +00:00
Robert Speicher 269aee790c Let Bootstrap's tab JS handle history 
Closes #2219
 2015-04-17 16:42:38 -04:00