summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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
| |/
* | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-212-15/+10
|/
* Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-164-11/+54
|\ | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
| * Make code clearerldap-attributesDouwe Maan2015-09-161-11/+9
| |
| * Shuffle config around a bitDouwe Maan2015-09-093-15/+9
| |
| * Add attributes to LDAP::Config.Douwe Maan2015-09-082-3/+8
| |
| * Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-083-11/+57
| |
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-113-6/+16
|\ \ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ Merge branch 'rs-fix-highlighting' into 'master'Douwe Maan2015-09-111-4/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syntax highlighting improvements On the server side: During development I would occasionally see SanitizationFilter sanitizing the result of SyntaxHighlightFilter, even though its attributes were whitelisted. This updates the `clean_spans` transformer to return the whitelisted node as [suggested by the Sanitize docs](http://git.io/vZR8i). On the client side: - Makes the syntax_highlight JS more flexible - Adds JS specs - Simplifies highlighting of new notes - Adds highlighting to Markdown preview See merge request !1278
| | * | RU-BO-COOOOOOOOPrs-fix-highlightingRobert Speicher2015-09-101-1/+1
| | | |
| | * | Prevent result of SyntaxHighlightFilter being sanitizedRobert Speicher2015-09-101-4/+8
| | | |
| * | | Add comments and clean up test for !1274Stan Hu2015-09-101-0/+2
| |/ /
| * | Gracefully handle errors in syntax highlighting by leaving the block unformattedStan Hu2015-09-101-1/+5
| | | | | | | | | | | | Closes #2433
| * | Merge branch 'fix-emojis-relative-url' into 'master'Douwe Maan2015-09-091-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix emoji URLs in Markdown when relative_url_root is used Path/URL helpers (e.g. `asset_url_helper`) already include the relative_url_root, so there is no need to attach it twice. Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example: RELATIVE_URL_ROOT=/gitlab rspec Closes #1728 See merge request !1254
| | * | Fix emoji URLs in Markdown when relative_url_root is usedStan Hu2015-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example: RELATIVE_URL_ROOT=/gitlab rspec Closes #1728
* | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-0936-59/+744
|\ \ \ \ | |/ / /
| * | | FogBugz project importJared Szechy2015-09-085-0/+424
| | |/ | |/|
| * | Fix URL construction for merge requests, issues, notes, and commits for ↵Stan Hu2015-09-041-6/+2
| |/ | | | | | | | | | | relative URL config Closes https://github.com/gitlabhq/gitlabhq/issues/9605
| * Merge branch 'grack-auth-new-instance' into 'master'Dmitriy Zaporozhets2015-09-021-0/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Avoid instance variable re-use trouble This is the quickest/dumbest/safest way I could think of to prevent the instance variable reuse problems we have on dev.gitlab.org now. See merge request !1237
| | * Avoid instance variable re-use troubleJacob Vosmaer2015-09-021-0/+8
| | | | | | | | | | | | | | | This is the quickest/dumbest/safest way I could think of to prevent the instance variable reuse problems we have on dev.gitlab.org now.
| * | Drone CI serviceKirilll Zaitsev2015-09-021-10/+15
| |/
| * Merge branch 'use_db_for_application_settings' into 'master'Marin Jankovski2015-09-011-1/+13
| |\ | | | | | | | | | | | | | | | | | | | | | Check if database connection exists when loading application settings !1217 broke omnibus-gitlab nightly builds. In omnibus-gitlab we precompile assets without a running database. See merge request !1230
| | * Added USE_DB env var to allow loading fake settings without db running.use_db_for_application_settingsMarin Jankovski2015-09-011-1/+13
| | |
| * | Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-0120-18/+127
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple Gitlab::Markdown from the GitlabMarkdownHelper This module is now the sole source of knowledge for *how* we render Markdown (and GFM). See merge request !1223
| | * | Require gitlab/markdown in ReferenceExtractorRobert Speicher2015-09-011-0/+2
| | | |
| | * | Remove unnecessary `strip` from `reference_class` methodRobert Speicher2015-08-311-1/+1
| | | |
| | * | Move REDCARPET_OPTIONS to a private methodRobert Speicher2015-08-311-14/+16
| | | | | | | | | | | | | | | | | | | | There wasn't really a reason to have them as a constant, and we were getting "already defined" warnings which are always annoying.
| | * | Make sure the main Gitlab::Markdown module gets loaded before filtersRobert Speicher2015-08-2718-1/+28
| | | |
| | * | Reference filters no longer take a custom class context optionRobert Speicher2015-08-272-3/+1
| | | |
| | * | Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher2015-08-273-14/+94
| | | | | | | | | | | | | | | | | | | | This module is now the sole source of knowledge for *how* we render Markdown (and GFM).
| * | | Merge branch 'fix-bitbucket-import-issue-order' into 'master'Douwe Maan2015-09-015-13/+54
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import all Bitbucket issues and sort issues by creation date Previously only the first 15 Bitbucket issues would be imported. Other issues in the API return call also calls import errors. Tested by importing 400+ issues from this repo: https://bitbucket.org/ned/coveragepy API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518 Closes https://github.com/gitlabhq/gitlabhq/issues/9519 See merge request !1226
| | * | | Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu2015-09-015-13/+54
| | | | | | | | | | | | | | | | | | | | Also fix a number of issues where author/reporter names were not available.
| | * | | Sort issues by creation date in Bitbucket importerStan Hu2015-09-011-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518 Closes https://github.com/gitlabhq/gitlabhq/issues/9519
| * | | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-serverJacob Vosmaer2015-08-314-4/+94
| |\ \ \ | | |/ /
| | * | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-2917-33/+429
| | |\ \
View Lorry Controller Status