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
23b6a98de0
Move Builds tab to the end
2015-12-08 22:28:28 +01:00
Douwe Maan
6c94a44295
Merge branch 'master' into mr-builds
...
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# app/views/projects/merge_requests/widget/_heading.html.haml
2015-12-08 22:26:29 +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
51ed5225ad
Merge branch 'serve_lfs_object' into 'master'
...
Serve LFS object
Depends on gitlab-org/gitlab_git!57
See merge request !1976
2015-12-08 14:19:52 +00:00
Douwe Maan
926c3bef9f
Merge branch 'master' into reference-pipeline-and-caching
2015-12-08 13:40:32 +01:00
Douwe Maan
1a10945066
Fix RedactorFilter
2015-12-08 13:40:23 +01:00
Douwe Maan
af6b543742
Make commit and MR ref filters aware of /builds path
2015-12-08 13:22:20 +01:00
Douwe Maan
13f44822d9
Move CombinedPipeline methods around
2015-12-08 12:29:48 +01:00
Robert Speicher
611912fe68
Store the demodulized reference filter name in data attribute
2015-12-07 19:40:46 -05:00
Robert Speicher
2379c8beea
Inline Gitlab::Blacklist in NamespaceValidator
2015-12-07 16:57:26 -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
3c97cbc74c
fixes after review
2015-12-07 15:13:06 +02:00
Valery Sizov
5df2c4419c
fox specs
2015-12-07 14:14:35 +02:00
Valery Sizov
5c1b49f494
Add added, modified and removed properties to commit object in webhook
2015-12-04 16:23:21 +02:00
Marin Jankovski
b2c4675cb0
Recursivity needed if a fork is a fork of a fork.
2015-12-04 12:32:13 +01:00
Douwe Maan
f9d954fae7
Satisfy rubocop
2015-12-03 19:02:56 +01:00
Douwe Maan
0de8e26066
Pass original text along with label reference filter.
2015-12-03 14:00:41 +01:00
Douwe Maan
f905fd239c
Use URL helpers in specs
2015-12-03 14:00:09 +01:00
Douwe Maan
0dcff1342b
Merge branch 'master' into reference-pipeline-and-caching
2015-12-03 13:34:25 +01:00
Douwe Maan
928d131e39
Merge branch 'master' into link-refs
2015-12-03 13:32:42 +01:00
Valery Sizov
162cd0099c
fix deprecation messages in tests
2015-12-03 10:33:43 +02: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
2f5074dc39
Expand inline docs.
2015-12-01 17:14:42 +01:00
Douwe Maan
d4030a845e
Pick up direct links to issues/MRs as references.
2015-12-01 16:53:07 +01:00
Douwe Maan
1d6d757dbd
Allow reference format as link href
2015-12-01 16:25:56 +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
bd4ab21c07
Fix code docs
2015-12-01 12:49:22 +01:00
Douwe Maan
f9017a2b03
Have ClosingIssueExtractor recognize all referenced issues
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
Valery Sizov
13c6096e42
Merge branch 'upload_hook' into 'master'
...
Fire update hook from GitLab
https://gitlab.com/gitlab-org/gitlab-ce/issues/3069
See merge request !1882
2015-11-30 17:22:00 +00:00
Valery Sizov and Valery Sizov
ae18ba1632
Fire update hook from GitLab
2015-11-30 18:36:34 +02:00
Valery Sizov
e92ceb7b57
fix specs
2015-11-30 16:12:31 +02:00
Valery Sizov and Valery Sizov
7f214cee74
Migrate mailers to ActiveJob
2015-11-26 17:03:43 +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
Robert Speicher
31a34b5917
Merge branch 'ci-artifacts-path' into 'master'
...
Expose artifacts path
This fixes broken artifacts storage path.
Fixes #3607
Fixes #3608
Related: gitlab-org/omnibus-gitlab!544
See merge request !1869
2015-11-23 22:19:13 +00:00
Kamil Trzcinski
11728b50f9
Expose artifacts path
2015-11-23 13:05:22 +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
a42d469ab2
Merge branch 'atom-feed-latest-update' into 'master'
...
Improve performance of user profiles, finding groups, and finding projects
This MR improves the following:
* Rendering of profile pages and Atom feeds
* Finding groups (using GroupsFinder & friends)
* Finding projects (using ProjectsFinder & friends)
Initially this MR was intended to only improve rendering of Atom feeds, but over time other fixes were introduced as well as the same code was the cause of all these problems.
See merge request !1790
2015-11-19 10:05:53 +00:00
Douwe Maan
Robert Speicher
Drew Blessing
Robert Speicher
Valery Sizov
Valery Sizov
Marin Jankovski
Yorick Peterse
Kamil Trzcinski