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
cbeb06eb42
Mix url helpers in into `RepositoryPush`
2015-12-11 13:00:24 +00:00
d8b3c3274c
AuthHash should not parameterize email user
2015-12-10 18:49:48 -05:00
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
23b6a98de0
Move Builds tab to the end
2015-12-08 22:28:28 +01:00
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
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
bf5683f889
Block LDAP user when they are no longer found in the LDAP server
2015-12-08 11:15:30 -06:00
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
926c3bef9f
Merge branch 'master' into reference-pipeline-and-caching
2015-12-08 13:40:32 +01:00
1a10945066
Fix RedactorFilter
2015-12-08 13:40:23 +01:00
af6b543742
Make commit and MR ref filters aware of /builds path
2015-12-08 13:22:20 +01:00
13f44822d9
Move CombinedPipeline methods around
2015-12-08 12:29:48 +01:00
66f658a9b5
Check if commits are available in `RepositoryPush`
2015-12-08 08:43:09 +01:00
591035968d
Duplicate options in `RepositoryPush`
2015-12-08 08:43:09 +01:00
75c6b29f6b
Add `RepositoryPush` specs
2015-12-08 08:43:09 +01:00
d835fbc79f
Fix url helpers in RepositoryPush
2015-12-08 08:43:09 +01:00
9f2752e5dc
Remove obsolete variables in `repository_push_email`
2015-12-08 08:43:08 +01:00
4beba7494b
Improve Messagee::RepositoryPush
2015-12-08 08:43:08 +01:00
e2f937ce22
Refactor RepositoryPush, move to Message namespace
2015-12-08 08:43:08 +01:00
8c6db54e12
Extract repository_push_email to separate class
2015-12-08 08:43:08 +01:00
611912fe68
Store the demodulized reference filter name in data attribute
2015-12-07 19:40:46 -05:00
2379c8beea
Inline Gitlab::Blacklist in NamespaceValidator
2015-12-07 16:57:26 -05:00
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
d611a38798
Merge branch 'master' into reference-pipeline-and-caching
2015-12-07 14:48:53 +01:00
3c97cbc74c
fixes after review
2015-12-07 15:13:06 +02:00
5df2c4419c
fox specs
2015-12-07 14:14:35 +02:00
5c1b49f494
Add added, modified and removed properties to commit object in webhook
2015-12-04 16:23:21 +02:00
b2c4675cb0
Recursivity needed if a fork is a fork of a fork.
2015-12-04 12:32:13 +01:00
f9d954fae7
Satisfy rubocop
2015-12-03 19:02:56 +01:00
0de8e26066
Pass original text along with label reference filter.
2015-12-03 14:00:41 +01:00
f905fd239c
Use URL helpers in specs
2015-12-03 14:00:09 +01:00
0dcff1342b
Merge branch 'master' into reference-pipeline-and-caching
2015-12-03 13:34:25 +01:00
928d131e39
Merge branch 'master' into link-refs
2015-12-03 13:32:42 +01:00
162cd0099c
fix deprecation messages in tests
2015-12-03 10:33:43 +02:00
044e0e33dc
Allow invalid URLs in closing pattern
2015-12-02 18:48:39 +01:00
60828ab40e
Merge branch 'master' into link-refs
2015-12-02 12:12:03 +01:00
2955ca613b
Merge branch 'master' into reference-pipeline-and-caching
2015-12-02 11:20:51 +01:00
2f5074dc39
Expand inline docs.
2015-12-01 17:14:42 +01:00
d4030a845e
Pick up direct links to issues/MRs as references.
2015-12-01 16:53:07 +01:00
1d6d757dbd
Allow reference format as link href
2015-12-01 16:25:56 +01:00
f3ea06eb7f
Autolink first so we don't pick up numeric anchors as issue references.
2015-12-01 15:53:32 +01:00
62c14ba2ed
Render commit reference using short sha, but include full sha in comment.
2015-12-01 12:58:45 +01:00
bd4ab21c07
Fix code docs
2015-12-01 12:49:22 +01:00
f9017a2b03
Have ClosingIssueExtractor recognize all referenced issues
2015-11-30 21:36:35 +01:00
d6a5b45c8e
Recognize issue/MR/snippet/commit links as references.
2015-11-30 21:36:34 +01:00
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
ae18ba1632
Fire update hook from GitLab
2015-11-30 18:36:34 +02:00
e92ceb7b57
fix specs
2015-11-30 16:12:31 +02:00
7f214cee74
Migrate mailers to ActiveJob
2015-11-26 17:03:43 +02:00
Douwe Maan
Grzegorz Bizon
Corey Hinshaw
Robert Speicher
Drew Blessing
Robert Speicher
Valery Sizov
Valery Sizov
Marin Jankovski