Douwe Maan
7781bda9bd
Move Markdown/reference logic from Gitlab::Markdown to Banzai
2015-12-15 15:51:16 +01:00
Kamil Trzciński
c810234357
Merge branch 'ci-project-migrate' into 'master'
...
Ci Project migrate
- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.
In 8.4 or 8.5 we can remove redundant tables and columns.
See merge request !1987
2015-12-14 10:35:40 +00:00
Kamil Trzciński
e81ae1e68c
Merge branch 'ci-services-migrate' into 'master'
...
Ci Services migrate
See merge request !1985
2015-12-14 10:32:57 +00:00
Kamil Trzcinski
513d551c8f
Fix after column rename
2015-12-11 18:02:10 +01:00
Kamil Trzcinski
e80e3f5372
Migrate CI::Project to Project
2015-12-11 18:02:09 +01:00
Douwe Maan
50f8366a89
Merge branch 'complexity/rubocop-metrics' into 'master'
...
Enable rubocop metrics
This enables rubocop metrics like CyclomaticComplexity and ABCSize.
Initial threshold values are high, should be probably decreased.
See merge request !1802
2015-12-11 15:06:31 +00:00
Corey Hinshaw
d8b3c3274c
AuthHash should not parameterize email user
2015-12-10 18:49:48 -05:00
Kamil Trzcinski
2988e1fbf5
Migrate CI::Services and CI::WebHooks to Services and WebHooks
2015-12-10 16:04:08 +01:00
Douwe Maan
10387f6b8a
Merge branch 'master' into tmp-reference-pipeline-and-caching
...
# Conflicts:
# spec/lib/gitlab/markdown/autolink_filter_spec.rb
# spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
# spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
# spec/lib/gitlab/markdown/cross_project_reference_spec.rb
# spec/lib/gitlab/markdown/emoji_filter_spec.rb
# spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/external_link_filter_spec.rb
# spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/label_reference_filter_spec.rb
# spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
# spec/lib/gitlab/markdown/redactor_filter_spec.rb
# spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
# spec/lib/gitlab/markdown/relative_link_filter_spec.rb
# spec/lib/gitlab/markdown/sanitization_filter_spec.rb
# spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
# spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
# spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
# spec/lib/gitlab/markdown/task_list_filter_spec.rb
# spec/lib/gitlab/markdown/upload_link_filter_spec.rb
# spec/lib/gitlab/markdown/user_reference_filter_spec.rb
2015-12-10 14:04:34 +01:00
Douwe Maan
13d6bab177
Tag lib specs
2015-12-09 11:55:42 +01:00
Robert Speicher
bcd89a58e7
Merge branch 'reference-pipeline-and-caching' into 'master'
...
Implement different Markdown rendering pipelines and cache Markdown
Builds on !1090 .
Related to !1014 .
Fixes #2054 .
See merge request !1602
2015-12-08 20:22:23 +00:00
Drew Blessing
bf5683f889
Block LDAP user when they are no longer found in the LDAP server
2015-12-08 11:15:30 -06:00
Douwe Maan
926c3bef9f
Merge branch 'master' into reference-pipeline-and-caching
2015-12-08 13:40:32 +01:00
Grzegorz Bizon
75c6b29f6b
Add RepositoryPush specs
2015-12-08 08:43:09 +01:00
Robert Speicher
611912fe68
Store the demodulized reference filter name in data attribute
2015-12-07 19:40:46 -05:00
Valery Sizov
bd5fb1b479
Merge branch 'webhook_payload_with_changes' into 'master'
...
Add added, modified and removed properties to commit object in webhook
https://gitlab.com/gitlab-org/gitlab-ee/issues/20
See merge request !1988
2015-12-07 14:43:13 +00:00
Douwe Maan
d611a38798
Merge branch 'master' into reference-pipeline-and-caching
2015-12-07 14:48:53 +01:00
Valery Sizov
5c1b49f494
Add added, modified and removed properties to commit object in webhook
2015-12-04 16:23:21 +02:00
Douwe Maan
f905fd239c
Use URL helpers in specs
2015-12-03 14:00:09 +01:00
Douwe Maan
044e0e33dc
Allow invalid URLs in closing pattern
2015-12-02 18:48:39 +01:00
Douwe Maan
60828ab40e
Merge branch 'master' into link-refs
2015-12-02 12:12:03 +01:00
Douwe Maan
2955ca613b
Merge branch 'master' into reference-pipeline-and-caching
2015-12-02 11:20:51 +01:00
Douwe Maan
9aac53bcee
Satisfy Rubocop
2015-12-02 10:54:24 +01:00
Douwe Maan
d4030a845e
Pick up direct links to issues/MRs as references.
2015-12-01 16:53:07 +01:00
Douwe Maan
f3ea06eb7f
Autolink first so we don't pick up numeric anchors as issue references.
2015-12-01 15:53:32 +01:00
Douwe Maan
62c14ba2ed
Render commit reference using short sha, but include full sha in comment.
2015-12-01 12:58:45 +01:00
Douwe Maan
4a0ebccf6b
Fix specs
2015-11-30 22:43:54 +01:00
Douwe Maan
bf5e7252ee
Recognize commit range with named refs in compare URLs.
2015-11-30 21:36:35 +01:00
Douwe Maan
d6a5b45c8e
Recognize issue/MR/snippet/commit links as references.
2015-11-30 21:36:34 +01:00
Douwe Maan
a7be01cd07
Render commit range reference with short shas, link to full shas.
2015-11-30 21:10:52 +01:00
Valery Sizov
e92ceb7b57
fix specs
2015-11-30 16:12:31 +02:00
Yorick Peterse
97f8c6279f
Added total query time to Sherlock
...
This makes it easier to see if a problem is caused by slow queries or
slow Ruby code (unrelated to any SQL queries that might be used).
2015-11-24 10:57:21 +01:00
Marin Jankovski
899807f604
Update required version of lfs client and separate the docs for users and admins.
2015-11-20 16:10:08 +01:00
Marin Jankovski
dbc0be1b27
Error 501 when client is using deprecated API.
2015-11-20 12:45:30 +01:00
Kamil Trzcinski
b8d8292bef
Fix upload tests, reformat code and make rubocop happy
2015-11-20 12:21:41 +01:00
Kamil Trzcinski
14d95b0529
Part of tests done [ci skip]
2015-11-20 11:59:32 +01:00
Kamil Trzcinski
888821f9ff
Add support for batch download operation
2015-11-19 19:28:14 +01:00
Douwe Maan
e1e67d383e
Move Markdown filters and pipelines into folders.
2015-11-19 16:18:13 +01:00
Douwe Maan
f5a630111f
Merge branch 'master' into reference-pipeline-and-caching
2015-11-19 15:46:04 +01:00
Yorick Peterse
9eefae6917
Fix UNION syntax for MySQL
...
Apparently MySQL doesn't support this syntax:
(...) UNION (...)
instead it only supports:
...
UNION
...
2015-11-18 13:31:18 +01:00
Yorick Peterse
d769596aec
Added Gitlab::SQL::Union class
...
This class can be used to join multiple AcitveRecord::Relation objects
together using a SQL UNION statement. ActiveRecord < 5.0 sadly doesn't
support UNION and existing Gems out there don't handle prepared
statements (e.g. they never incremented the variable bindings).
2015-11-18 13:02:43 +01:00
Marin Jankovski
14032d8eb1
Add support for git lfs.
2015-11-16 12:39:13 +01:00
Dmitriy Zaporozhets
3c16fb93fc
Move spec to proper place and fix unused variable
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-11-13 09:45:21 +01:00
Yorick Peterse
7b5fd8742e
Track the amount of times views are rendered
2015-11-09 14:29:10 +01:00
Yorick Peterse
db46d49c0e
Fixed Hash key style in Sherlock::Query spec
2015-11-09 14:29:10 +01:00
Yorick Peterse
265ef867ff
Added specs and source documentation for Sherlock
2015-11-09 14:29:10 +01:00
Valery Sizov and Valery Sizov
9479496f75
Add added, modified and removed properties to commit object in webhook
2015-11-03 12:16:40 +02:00
Douwe Maan
329e067ff1
Merge branch 'rs-dev-issue-2613' into 'master'
...
Add custom protocol whitelisting to SanitizationFilter
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613
We allow any protocol for autolinks: irc://irc.freenode.net/git
But manual Markdown links with the same protocol get sanitized: `[This will not be clickable](irc://irc.freenode.net/git)`: [This will not be clickable](irc://irc.freenode.net/git)
To get around this we have to first allow *all* protocols, and then manually clean dangerous (i.e., `javascript:`) protocols.
See merge request !1496
2015-11-02 10:49:46 +00:00
Douwe Maan
740feeec77
Merge branch 'master' into reference-pipeline-and-caching
2015-10-27 15:06:40 +01:00
Douwe Maan
b6f8d0100e
Merge branch 'dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses'
2015-10-25 11:55:14 +01:00
Douwe Maan
Kamil Trzciński
Corey Hinshaw
Robert Speicher
Drew Blessing
Grzegorz Bizon
Robert Speicher
Valery Sizov
Valery Sizov
Yorick Peterse
Marin Jankovski
Dmitriy Zaporozhets