Douwe Maan and Robert Speicher
76ec8a112e
Merge branch 'optimize_ldap' into 'master'
...
Optimize LDAP and add a search timeout
Related to #4282
This merge request arranges some things in `access.rb` to facilitate some optimizations in EE (to come later). It also adds a 10 second timeout to all LDAP searches so the entire worker is not blocked if some query doesn't return in a reasonable amount of time. This timeout is configurable per LDAP server.
See merge request !2267
2016-01-11 12:33:16 -05:00
Stan Hu and Robert Speicher
34d0f22637
Merge branch 'suppress-allow-failure-builds' into 'master'
...
Suppress e-mails on failed builds if allow_failure is set
Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about the benchmarks and others that have `allow_failure` set to `true`.
@ayufan mentioned creating a summary e-mail to prevent getting one e-mail per build, but the latter might actually be desirable. For example, I do want to know if Rubocop errors fail right away.
See merge request !2178
2016-01-08 13:14:23 -05:00
Gabriel Mazetto and Marin Jankovski
b3ce9a1d24
reCAPTCHA is configurable through Admin Settings, no reload needed.
2015-12-29 11:13:50 +01:00
Douwe Maan and Robert Speicher
e9a2ab1152
Merge branch 'ldap-special-chars-fix' into 'master'
...
Fix identity and user retrieval when special characters are used
Fixes #4023
I also added tests to make sure the user with special characters in his name is returned correctly.
@rspeicher this probably should be added to 8.3 as a patch.
See merge request !2176
2015-12-24 13:41:04 -05:00
Drew Blessing
f177aaa5fa
Backport JIRA service
2015-12-18 14:19:48 -06:00
Dmitriy Zaporozhets
40104746d6
Merge remote-tracking branch 'origin/feature/update-rubocop'
2015-12-16 13:44:50 +01:00
Douwe Maan
7781bda9bd
Move Markdown/reference logic from Gitlab::Markdown to Banzai
2015-12-15 15:51:16 +01:00
Gabriel Mazetto
b5291f9599
Fixed Rubocop offenses
2015-12-15 00:53:52 -02: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
dd8102f2d1
Fix specs
2015-12-11 18:02:10 +01:00
Kamil Trzcinski
8cdd54cc06
Add runners token
2015-12-11 18:02:09 +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
Grzegorz Bizon
cbeb06eb42
Mix url helpers in into RepositoryPush
2015-12-11 13:00:24 +00:00
Corey Hinshaw
d8b3c3274c
AuthHash should not parameterize email user
2015-12-10 18:49:48 -05:00
Kamil Trzcinski
d5c91bb9a6
Migrate CI WebHooks and Emails to new tables
2015-12-10 16:04:08 +01: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
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
Grzegorz Bizon
66f658a9b5
Check if commits are available in RepositoryPush
2015-12-08 08:43:09 +01:00
Grzegorz Bizon
591035968d
Duplicate options in RepositoryPush
2015-12-08 08:43:09 +01:00
Grzegorz Bizon
75c6b29f6b
Add RepositoryPush specs
2015-12-08 08:43:09 +01:00
Grzegorz Bizon
d835fbc79f
Fix url helpers in RepositoryPush
2015-12-08 08:43:09 +01:00
Grzegorz Bizon
9f2752e5dc
Remove obsolete variables in repository_push_email
2015-12-08 08:43:08 +01:00
Grzegorz Bizon
4beba7494b
Improve Messagee::RepositoryPush
2015-12-08 08:43:08 +01:00
Grzegorz Bizon
e2f937ce22
Refactor RepositoryPush, move to Message namespace
2015-12-08 08:43:08 +01:00
Grzegorz Bizon
8c6db54e12
Extract repository_push_email to separate class
2015-12-08 08:43:08 +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 MaanandRobert Speicher
Stan HuandRobert Speicher
Gabriel MazettoandMarin Jankovski
Drew Blessing
Dmitriy Zaporozhets
Kamil Trzciński
Grzegorz Bizon
Corey Hinshaw
Robert Speicher
Valery Sizov
Valery Sizov