b88da58cb6
Add `reference_pattern` to Referable models
2015-05-26 15:48:32 -04:00
9d032cddf5
Correct the ReferenceFilter html/pipeline/filter require
2015-05-26 15:48:31 -04:00
08102ad748
Merge branch 'rs-issue-1690' into 'master'
...
Better handle label references that aren't actually references
Fixes #1690
See merge request !705
2015-05-26 14:35:54 +00:00
b263a33c80
Better handle label references that aren't actually references
...
Fixes #1690
2015-05-25 16:06:34 -04:00
3b22cfe600
Remove Rack Attack monkey patches and bump to version 4.3.0
2015-05-22 16:25:03 -04:00
212fe14c65
Customize the sanitization whitelist only once
...
Fixes #1651
2015-05-20 21:16:11 -04:00
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
b0659c1b07
Simplify and unify helpers for rendering markup
2015-05-18 22:52:13 +02:00
daa0925016
Rename MarkdownHelper to MarkupHelper
2015-05-18 22:51:56 +02:00
8dbc4746fe
Handle AsciiDoc better, reuse HTML pipeline filters ( fixes #9263 )
2015-05-18 20:48:03 +02:00
241f5971ba
Add search issues/MR by number
2015-05-18 13:09:13 +06:00
9c6f4a2351
Merge branch 'dashboard-references' into 'master'
...
Fix reference links in dashboard activity and ATOM feeds.
References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.
This MR passes the project in question to the reference parsers in an option.
cc @rspeicher
See merge request !653
2015-05-15 09:59:26 +00:00
947231a461
Merge branch 'rs-relative-link-filter' into 'master'
...
Minor RelativeLinkFilter cleanup
See merge request !649
2015-05-14 14:37:43 +00:00
cd52cef1c0
Fix reference links in dashboard activity and ATOM feeds.
2015-05-14 13:05:33 +02:00
7f2fb72a0a
Minor RelativeLinkFilter cleanup
2015-05-13 14:08:37 -04:00
c291ff9c6f
Use SIGKILL by default in Sidekiq::MemoryKiller
...
This makes the memory growth-triggered Sidekiq restarts more reliable by
reducing the chance that Sidekiq ends up in a state where it is not
accepting new jobs but also not shutting down: SIGKILL is more likely to
work than SIGTERM.
2015-05-13 17:09:12 +02:00
8ad91d5840
Merge branch 'text-batch-1' into 'master'
...
Batch 1 of text improvements
Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved.
This batch includes:
- Improve text on error pages.
- Improve Git access error messages.
- Improve description of branch protection levels.
- Improve OAuth signup error message.
- Improve OAuth application flash messages.
cc @rspeicher
See merge request !642
2015-05-13 12:05:17 +00:00
740716afd1
Merge pull request #9276 from jirutka/relative_link_filter
...
Extract handling of relative file links to its own HTML filter
2015-05-13 14:09:57 +03:00
c5e4b443ff
Fix GitAccess.
2015-05-13 09:46:22 +02:00
17a41547a0
Improve OAuth signup error message.
2015-05-13 09:41:56 +02:00
9eb45ccd55
Improve description of branch protection levels.
2015-05-13 09:41:55 +02:00
1f72c387c9
Improve Git access error messages.
2015-05-13 09:41:55 +02:00
125cb9b866
Don't accidentally unblock auto created users from Active Directory.
2015-05-12 11:26:43 +02:00
b3276661f7
RelativeLinkFilter: refactor according to suggestions by @tsigo
2015-05-11 20:43:18 +02:00
f7adac87fe
Extract handling of relative file links to RelativeLinkFilter
2015-05-11 02:07:26 +02:00
70bbf093aa
Remove class and id attributes from SanitizationFilter whitelist
2015-05-08 12:31:34 -04:00
6c32abc5f7
Merge branch 'rs-task_list' into 'master'
...
Use task_list gem for task lists
Task Lists can now be used in comments, and they'll render in previews. 👏
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271
See merge request !599
2015-05-08 09:39:48 +00:00
1c1f18b416
Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env var
...
It looks like SIGTERM may not be enough to shut down a Sidekiq process
when its RSS has gotten too big. This change will allow us to experiment
with sending SIGKILL instead of SIGTERM to Sidekiq processes on
gitlab.com.
2015-05-07 18:47:03 +02:00
cca28c7920
Update Markdown help docs for latest changes
2015-05-06 21:04:33 -04:00
6883e6e084
Remove all references to `parse_tasks`
2015-05-06 12:58:28 -04:00
61c73575c3
Add TaskList::Filter to pipeline
2015-05-06 12:58:27 -04:00
b953796ac8
Update authentication.rb
...
correct spelling
2015-05-04 14:09:03 +02:00
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
0ae574007d
add common method to force utf8 and force oauth properties to be utf8
2015-05-03 00:43:46 +03:00
84a7675ea6
Remove title_for_issue helper
2015-04-30 17:27:33 -04:00
242bebc134
Remove special handling for the `'` problem
...
While `escape_once` will create this HTML entity, Nokogiri always
translates it back before it gets to IssueReferenceFilter, so there
should be no danger of erroneous issue links.
2015-04-30 16:35:27 -04:00
0027c2ddd7
Add Project#get_issue
2015-04-30 16:35:27 -04:00
466bec7caa
Rename SCHEME_PATTERN to LINK_PATTERN
2015-04-30 16:35:27 -04:00
cd3c24a8f3
Autolink short URLs
2015-04-30 16:35:27 -04:00
50f707e27a
Update Autolink SCHEME_PATTERN
2015-04-30 16:35:26 -04:00
9ec8a5f75d
Doc typo
2015-04-30 16:35:26 -04:00
588267b5e2
Update the Gitlab::Markdown docs
2015-04-30 16:35:26 -04:00
e46d1cdd8b
Add Gitlab::Markdown::SanitizationFilter
...
This just extends the HTML::Pipeline::SanitizationFilter with our custom
whitelist.
2015-04-30 16:35:25 -04:00
aa2cc670fe
Add Gitlab::Markdown::AutolinkFilter
2015-04-30 16:35:25 -04:00
382a0aa6ef
Add Gitlab::Markdown::TableOfContentsFilter
...
Removes header and table of contents processing from Redcarpet renderer.
2015-04-30 16:35:25 -04:00
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
a1c01bc19b
Fix (project_)name_regex to accept non-ASCII letters and dash
2015-04-27 16:38:47 +02:00
278c3ba401
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-04-27 11:38:36 +03:00
7ee1d68e0d
Merge pull request #9186 from Senorsen/patch-1
...
Fix contributions calendar empty problem under mysql
2015-04-27 11:20:24 +03:00
b4317b1656
Merge branch 'fix-gitorious-importer' into 'master'
...
Get Gitorious importer to work again.
Fixes #1504 .
See merge request !576
2015-04-27 07:42:32 +00:00
Robert Speicher
Dmitriy Zaporozhets
Stan Hu
Jakub Jirutka
Nikita Verkhovin
Douwe Maan
Jacob Vosmaer
quodos
Onur Küçük