b12e17ff55
Merge branch 'web_hook_repo_changes'
2015-11-03 15:05:50 +02:00
9479496f75
Add added, modified and removed properties to commit object in webhook
2015-11-03 12:16:40 +02:00
fe34b745e7
Fix tests
2015-11-03 11:05:54 +01:00
c03da1caad
Extend yml syntax for only and except to support specifying repository path
2015-11-02 14:44:06 +01:00
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
b6f8d0100e
Merge branch 'dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses'
2015-10-25 11:55:14 +01:00
69e5e260b0
Add spec for cloning Wiki over HTTP
2015-10-22 14:16:37 -07:00
2305483d7d
Require jobs to be named
2015-10-22 10:39:00 +02:00
d7bcfe4fc0
Fix issue #3055 (project search with unmatched parentheses)
2015-10-21 10:20:40 -02:00
34148d1576
Merge branch 'master' into rs-redactor-filter
2015-10-16 11:26:48 +02:00
9419046196
Fix specs
2015-10-15 23:51:45 +02:00
0aa6061d6a
Implement when syntax in .gitlab-ci.yml
2015-10-15 23:49:39 +02:00
95f0440a78
Merge branch 'master' into rs-redactor-filter
2015-10-15 11:26:58 +02:00
8f584d5f2c
Fix: Images cannot show when projects' path was changed
2015-10-14 18:50:35 +03:00
61d8f96176
Fix specs
2015-10-14 13:46:17 +02:00
93fcddd7a7
Allow ReferenceExtractor to efficiently load references from multiple texts at once
2015-10-13 22:53:05 +02:00
42603af326
Merge branch 'fix_email_downcasing' into 'master'
...
LDAP email address downcasing
Fixes #2960
In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address.
If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved.
This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression.
See merge request !1550
2015-10-11 22:53:11 +00:00
69b41ba043
Normalize space-like characters in keys before output to gitlab-shell
...
gitlab-shell expects only one tab separator per key, and an SSH key with
a tab character in the comment, for example, would break things.
Closes #2970
2015-10-08 20:34:50 -04:00
b7def88c02
Fix ldap email downcasing bug
2015-10-08 14:59:46 -05:00
85c6a3743a
Added methods for detecting MySQL/PostgreSQL
...
These two methods remove the need for manually going into
ActiveRecord::Base.connection all over the place.
2015-10-07 23:32:14 +02:00
72afcbcd37
Always allow references to the current project
2015-10-07 19:19:23 +02:00
f42cfa9e87
Refactor reference gathering to use a dedicated filter
2015-10-07 17:00:48 +02:00
4f629dab2a
Merge branch 'master' into rs-redactor-filter
2015-10-07 15:15:35 +02:00
517815f40f
Fix gitlab_ci_yaml_processor specs
2015-10-05 16:07:50 +02:00
d2d2df0738
Fix next round of tests
2015-10-05 13:12:00 +02:00
aed145a9c6
Fix rubocop warnings in spec/lib and spec/tasks
2015-10-03 16:02:21 -05:00
16f8ca566b
Add custom protocol whitelisting to SanitizationFilter
...
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613
2015-10-01 23:40:29 -04:00
0f3deac362
Fix tests
2015-09-29 10:47:04 +02:00
04c4445ae0
Test grace auth against gitlab_ci_project with token
2015-09-24 20:19:27 +02:00
ce19e1739e
Update stub syntax
2015-09-24 14:12:25 -04:00
5d69bc656a
Fix grack auth spec
2015-09-24 17:47:57 +02:00
73a3df4de3
Fix LDAP attribute mapping
2015-09-23 16:37:59 +02:00
d4acda1253
Merge branch 'rs-relative-link-up-one' into 'master'
...
Allow relative links to go up one directory level
See merge request !1352
2015-09-21 19:38:37 +00:00
ee028d9d60
Rename reply_by_email to incoming_email to prepare for the future.
2015-09-21 10:35:37 +02:00
2b94f5fb06
Allow RelativeLinkFilter to go up multiple directories
2015-09-20 19:21:33 -04:00
619f04c196
Allow relative links to go up one directory level
2015-09-18 14:03:42 -04:00
a0c1a12dee
remove API calls from CE to CI
2015-09-18 18:02:11 +02:00
09bcce7d1f
Merge branch 'ldap-attributes' into 'master'
...
Allow configuration of LDAP attributes GitLab will use for the new user account.
Fixes #2412 .
See merge request !1261
2015-09-16 18:34:55 +00:00
b87ca7500f
fix specs. Stage 7
2015-09-15 17:43:17 +03:00
e2cbb36ba9
fix specs. Stage 5
2015-09-15 15:51:03 +03:00
4c53cc0eba
rubocop satisfy
2015-09-14 14:37:18 +03:00
e3c30bf2e8
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-11 16:32:11 +02:00
ae5d2f5b31
Fix Ci::Ansi2html spec
2015-09-11 13:10:37 +02:00
267687993a
Add comments and clean up test for !1274
2015-09-10 14:24:10 -07:00
9d3344adbb
Gracefully handle errors in syntax highlighting by leaving the block unformatted
...
Closes #2433
2015-09-10 09:16:27 -07:00
0b5d627cd4
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-09 14:56:02 +02:00
90c338a495
Move helpers back to original directory
2015-09-09 14:37:34 +02:00
cc4ef4da11
Refactor CI tests
2015-09-09 14:17:16 +02:00
c52fee70d0
Test overriding LDAP attributes
2015-09-09 11:51:40 +01:00
0e9ba0a4fa
Add attributes to LDAP::Config.
2015-09-08 17:34:18 +01:00
Valery Sizov