home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,834 Commits 48 Branches 340 Tags
e5752d9f578a5ccf045fa4988041c8cbcc4c82b4
Commit Graph
63 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 80a983b492 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-22 12:25:41 +02:00
Robert Speicher 2b94f5fb06 Allow RelativeLinkFilter to go up multiple directories 2015-09-20 19:21:33 -04:00
Robert Speicher 619f04c196 Allow relative links to go up one directory level 2015-09-18 14:03:42 -04:00
Dmitriy Zaporozhets 1ba393de81 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-09-16 10:26:10 +02:00
Stan Hu 267687993a Add comments and clean up test for !1274 2015-09-10 14:24:10 -07:00
Stan Hu 9d3344adbb Gracefully handle errors in syntax highlighting by leaving the block unformatted 
Closes #2433
 2015-09-10 09:16:27 -07:00
Robert Speicher 8e7111f79d Reference filters no longer take a custom class context option 2015-08-27 15:36:26 -07:00
Dmitriy Zaporozhets 243bf65124 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 17:15:12 +02:00
Robert Speicher 646c1f0324 Re-enable the "links with adjacent text" UserReferenceFilter spec 2015-08-24 18:56:01 -07:00
Robert Speicher 747fe7520b Remove trailing HTML entities from non-Rinku autolinks as well. 2015-08-20 18:25:16 -07:00
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00
Robert Speicher fb6f8d9198 Merge branch 'rs-reference-data-attrs' into 'master' 
Add `data-[type]-id` attribute to reference links

This is to let us redact them later in another filter.

See merge request !1110
 2015-08-10 00:07:56 +00:00
Robert Speicher 32e63ba7a1 Add data-[type]-id attribute to reference links 
This is to let us redact them later in another filter.
 2015-08-08 16:43:29 -04:00
Robert Speicher fb6dc1f07d Add Group#add_* convenience methods 
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
 2015-08-07 00:20:02 -04:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Robert Speicher 4e22dcb6a3 Add spec to RelativeLinkFilter for Unicode filenames 2015-07-30 17:25:07 -04:00
Dmitriy Zaporozhets dd32818441 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/assets/javascripts/project_new.js.coffee
	app/helpers/appearances_helper.rb
	app/helpers/application_helper.rb
	app/helpers/groups_helper.rb
	app/helpers/oauth_helper.rb
	app/models/user.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/layouts/nav/_group.html.haml
	app/views/layouts/nav/_project_settings.html.haml
	app/views/profiles/accounts/show.html.haml
	doc/integration/README.md
	features/steps/project/merge_requests.rb
	features/support/env.rb
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/oauth_helper_spec.rb
	spec/lib/gitlab/ldap/access_spec.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/project_team_spec.rb
	spec/routing/admin_routing_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/test_hook_service_spec.rb
 2015-07-02 17:07:02 +02:00
Stan Hu 52aa21b12d Fix Style/IndentationWidth cop violations 2015-06-22 22:25:40 -07:00
Robert Speicher 94eff65569 Fix Style/SpaceInsideHashLiteralBraces cop violations 
These fixes were performed automatically by Rubocop's `-a` flag.
 2015-06-22 14:41:00 -04:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Robert Speicher 9e7a9c63a5 Further limit the limited whitelist for project/group descriptions 2015-06-02 13:41:12 -04:00
Robert Speicher 79c4e3899f Rename ReferenceFilterSpecHelper to FilterSpecHelper 
And make it more generalized for all filter specs.
 2015-06-02 13:27:53 -04:00
Robert Speicher 023dd2907b Add a pipeline context option for SanitizationFilter 
When this option is `:description`, we use a more restrictive whitelist.
This is used for Project and Group description fields.
 2015-06-02 13:04:10 -04:00
Robert Speicher 7424d2fa5b Add ExternalLinkFilter to Markdown pipeline 
Forces a `rel="nofollow"` attribute on all external links.
 2015-05-27 15:39:08 -04:00
Robert Speicher 81a09bc74c Support only double quotes for multi-word label references 2015-05-26 15:49:20 -04:00
Robert Speicher 94af050117 Use to_reference in reference filter specs 2015-05-26 15:48:32 -04:00
Robert Speicher 136ab73803 Update CommitRange#to_reference to use full SHAs 
We only want them shortened by the filter, which calls to_s
 2015-05-26 15:48:31 -04:00
Robert Speicher b263a33c80 Better handle label references that aren't actually references 
Fixes #1690
 2015-05-25 16:06:34 -04:00
Robert Speicher 8ee382087d Subclass TaskList::Filter to fix a bug 
Instead of using a fork, we subclass the filter and only apply the
`task-list` class to list items that actually are task lists.

Closes #1645

See https://github.com/github/task_list/pull/60
 2015-05-20 12:08:33 -04:00
Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html
 2015-05-15 13:29:58 +03:00
Robert Speicher 7f2fb72a0a Minor RelativeLinkFilter cleanup 2015-05-13 14:08:37 -04:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Jakub Jirutka 44b82396d1 Add spec for RelativeLinkFilter 2015-05-12 02:12:47 +02:00
Robert Speicher 70bbf093aa Remove class and id attributes from SanitizationFilter whitelist 2015-05-08 12:31:34 -04:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02: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
Robert Speicher d2b36e6b90 Add a jira_project project factory 2015-04-27 15:27:18 -04:00
Robert Speicher b41fe91ece Add result to ExternalIssueReferenceFilter 2015-04-27 15:25:44 -04:00
Robert Speicher 07a88040a4 Fix NotificationService spec 2015-04-25 16: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 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
Robert Speicher b389424627 Skip failing test until usernames can't end in periods again 2015-04-20 13:01:47 -04:00