summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Add added, modified and removed properties to commit object in webhookweb_hook_repo_changesValery Sizov2015-11-031-2/+31
|
* Merge branch 'rs-dev-issue-2613' into 'master' Douwe Maan2015-11-021-0/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add custom protocol whitelisting to SanitizationFilterrs-dev-issue-2613Robert Speicher2015-10-011-0/+19
| | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613
* | Merge branch 'gitlab-workhorse' into 'master' Dmitriy Zaporozhets2015-10-301-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Switch to gitlab-workhorse This is a little annoying but it is better to change this name then to be stuck with a bad name for a long time. Reasons for the name change: https://gitlab.com/gitlab-org/gitlab-git-http-server/issues/13 See merge request !1707
| * | Switch to gitlab-workhorseJacob Vosmaer2015-10-291-1/+1
| | |
* | | Add ability to create directories in the editorBen Ford2015-10-291-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply type a name with a `/` directory separator and new directories will be created. This does not do the fancy UI work that github.com does, but it will get the job done. I could not find tests for file creation, so I didn't add a test for this slight behaviour modification. I did test directory traversals though, using both absolute paths like `/tmp/foo.txt` and relative paths like `../../foo.txt`. Neither case escaped the repository, though attempting to traverse with a relative path resulted in a 500 error that did not affect application stability upon reload.
* | | Merge branch 'dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses'Douwe Maan2015-10-251-1/+1
|\ \ \ | |/ / |/| |
| * | Fix issue #3055 (project search with unmatched parentheses)dirceu/gitlab-ce-fix-project-search-with-unmatched-parenthesesDirceu Pereira Tiegs2015-10-211-1/+1
| | |
* | | Fix cloning Wiki repositories via HTTPStan Hu2015-10-221-1/+8
| | | | | | | | | | | | | | | | | | | | | Cloning a project Wiki over HTTP would end up cloning the main repository since the .wiki extension was being stripped. Closes #3106
* | | Merge branch 'project-path-case-sensitivity' into 'master' Robert Speicher2015-10-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prefer project with exact path to differently cased one when both exist. Fixes #3113. See merge request !1649
| * | | Fix Gitlab::Database#mysql?Douwe Maan2015-10-221-1/+1
| | | |
* | | | Speed up searching for text references a bitYorick Peterse2015-10-201-4/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | If a node is ignored there's no need for searching for a given pattern. In turn, when searching for the pattern there's no need to construct a MatchData object as we only care about presence (or lack thereof), not the resulting matches. In terms of performance this cuts down about 200 ms when loading issue #2164 locally, though this varies a bit depending on system load.
* | | Fix bug where a push would only create cross references from the first commit.hash-block-returnDouwe Maan2015-10-181-1/+1
| | |
* | | Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-162-3/+10
|\ \ \
| * \ \ Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-151-1/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Let gitlab-git-http-server handle archive downloads This change relies on changes in gitlab_git and gitlab-git-http-server. fixes #2429 See merge request !1548
| | * | Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-157-2/+100
| | |\ \
| | * | | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-081-1/+8
| | | | | | | | | | | | | | | | | | | | This change relies on changes in gitlab_git and gitlab-git-http-server.
| * | | | Merge branch 'incoming-email-config' into 'master' Robert Speicher2015-10-141-2/+2
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Reply by email easier to configure Builds on !1566. Omnibus companion MR: gitlab-org/omnibus-gitlab!510 (cc @marin) See merge request !1580
| | * | | Make Reply by email easier to configureDouwe Maan2015-10-131-2/+2
| | | | |
* | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-157-2/+100
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-141-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Simplify code around (cross)-references See merge request !1568
| | * | | | Simplify code around (cross)-referencesDouwe Maan2015-10-121-0/+2
| | |/ / /
| * | | | Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-143-0/+84
| | | | |
| * | | | Merge branch 'fix_email_downcasing' into 'master' Robert Speicher2015-10-111-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Fix ldap email downcasing bugDrew Blessing2015-10-081-1/+1
| | | | |
| * | | | Normalize space-like characters in keys before output to gitlab-shellrs-issue-2970Robert Speicher2015-10-081-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Added methods for detecting MySQL/PostgreSQLYorick Peterse2015-10-071-0/+11
| |/ / | | | | | | | | | | | | These two methods remove the need for manually going into ActiveRecord::Base.connection all over the place.
* | | Explicitly only parse references by specified filterDouwe Maan2015-10-142-2/+8
| | |
* | | Have Issue#participants load all users mentioned in notes using a single queryDouwe Maan2015-10-141-10/+11
| | |
* | | Code cleanupDouwe Maan2015-10-133-23/+17
| | |
* | | Allow ReferenceExtractor to efficiently load references from multiple texts ↵Douwe Maan2015-10-133-12/+29
| | | | | | | | | | | | at once
* | | Efficiently load multiple references of one type.Douwe Maan2015-10-137-23/+33
| | |
* | | Pass project to RedactorFilterDouwe Maan2015-10-132-4/+9
| | |
* | | Raise error when a ReferenceFilter doesn't implement referenced_byDouwe Maan2015-10-081-1/+1
| | |
* | | Update inline docDouwe Maan2015-10-081-2/+2
| | |
* | | Update ReferenceFilter docsRobert Speicher2015-10-071-10/+9
| | | | | | | | | | | | [ci skip]
* | | Always allow references to the current projectDouwe Maan2015-10-074-5/+8
| | |
* | | Refactor reference gathering to use a dedicated filterDouwe Maan2015-10-0712-89/+169
| | |
* | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-0729-72/+597
|\ \ \ | |/ /
| * | Fix rubocop warnings in libGuilherme Garnier2015-10-034-5/+2
| |/
| * Merge branch 'show-diff-stats-for-mr'Dmitriy Zaporozhets2015-10-012-0/+16
| |\
| | * Show additions/deletions stats on merge request diffDmitriy Zaporozhets2015-10-012-0/+16
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add support of multibyte characters in LDAP UIDПетров Роман2015-09-301-1/+1
| |/
| * Merge pull request #9650 from szechyjs/fb-close-commentStan Hu2015-09-251-1/+1
| |\ | | | | | | FogBugz Import: Include closed comments since they may contain user data
| | * FogBugz Import: Closed comments may contain user dataJared Szechy2015-09-211-1/+1
| | |
| | * Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diffDouwe Maan2015-09-201-1/+2
| | |
| * | Fix LDAP attribute mappingfix-ldap-attributesDouwe Maan2015-09-231-1/+2
| | |
| * | Merge branch 'rs-relative-link-up-one' into 'master' Robert Speicher2015-09-211-11/+29
| |\ \ | | | | | | | | | | | | | | | | Allow relative links to go up one directory level See merge request !1352
| | * | Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-oneRobert Speicher2015-09-201-2/+1
| | | |
| | * | Allow relative links to go up one directory levelRobert Speicher2015-09-181-11/+30
| | |/
View Lorry Controller Status