summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| | |/
| * | 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
| | | |
| * | | Move helpers back to original directoryDmitriy Zaporozhets2015-09-091-1/+1
| | | |
| * | | Groundwork for merging CI into CEDouwe Maan2015-08-257-8/+8
| | | |
* | | | Basic support for an Atom-specific rendering pipelineRobert Speicher2015-09-031-51/+60
| | | |
* | | | Add post_process method to Gitlab::MarkdownRobert Speicher2015-09-011-0/+22
| | | |
* | | | Remove `current_user` context from markdown and gfm helpersRobert Speicher2015-09-011-1/+0
| | | | | | | | | | | | | | | | These helpers are no longer dependent on the current user state. Hooray!
* | | | Rescue from `RecordNotFound` in RedactorFilterRobert Speicher2015-09-011-0/+4
| | | |
* | | | Default `user_can_reference?` to true when no attributes matchRobert Speicher2015-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | Now, a reference link with a `.gfm` class but without one of our `data-*-id` attributes should be shown to the user rather than hidden.
* | | | Add RedactorFilterRobert Speicher2015-09-012-0/+67
| | | |
View Lorry Controller Status