summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | fix specs. Stage 2Valery Sizov2015-09-143-88/+8
| | | | |
| * | | | rubocop satisfyValery Sizov2015-09-141-18/+18
| | | | |
| * | | | Fix IOError when fetching a new build by runnerKamil Trzcinski2015-09-141-1/+8
| | | | |
| * | | | Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of ↵Valery Sizov2015-09-145-6/+35
| |\ \ \ \ | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| | * \ \ \ Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-115-6/+35
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | 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
| | | |/ / /
| | | * | | Merge branch 'rescue-syntax-highlighting-errors' into 'master'Robert Schilling2015-09-101-1/+5
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gracefully handle errors in syntax highlighting by leaving the block unformatted A bug in Rouge caused an Exception: ```undefined method `sub' for :Literal:Symbol``` That caused https://gitlab.com/embeddable-common-lisp/ecl/issues/156 to hit Error 500 and fail to display. If a failure occurs, just render the text as preformatted. Closes #2433 See merge request !1274
| | | | * | | Gracefully handle errors in syntax highlighting by leaving the block unformattedStan Hu2015-09-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2433
| | | * | | | Added service API endpoint to retrieve service parametersPetheo Bence2015-09-102-0/+19
| | | |/ / /
| | | * | | 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
| * | | | | | fix of APIValery Sizov2015-09-141-2/+6
| |/ / / / /
| * | | | | Remove network from CIDmitriy Zaporozhets2015-09-112-3/+3
| | | | | |
| * | | | | integration with gitlab authValery Sizov2015-09-091-5/+5
| | | | | |
| * | | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-0948-230/+1048
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'nginx-git-http' into 'master'Dmitriy Zaporozhets2015-09-092-0/+18
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not let NGINX buffer Git HTTP requests Before this change NGINX would convert a chunked HTTP POST (e.g. git push) into a HTTP 1.0 single large POST. This creates an unnecessary delay, and it creates unnecessary memory pressure on gitlab-git-http-server. For the response ('proxy_buffering') I am less sure that NGINX 's buffering behavior is harmful, but it still makes more sense to me not to interfere with gitlab-git-http-server (and the Golang net/http server). See merge request !1256
| | | * | | | The good stuff needs NGINX 1.7.11nginx-git-httpJacob Vosmaer2015-09-072-6/+10
| | | | | | |
| | | * | | | Do not let NGINX buffer Git HTTP requestsJacob Vosmaer2015-09-072-0/+14
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change NGINX would convert a chunked HTTP POST (e.g. git push) into a HTTP 1.0 single large POST. This creates an unnecessary delay, and it creates unnecessary memory pressure on gitlab-git-http-server. For the response ('proxy_buffering') I am less sure that NGINX 's buffering behavior is harmful, but it still makes more sense to me not to interfere with gitlab-git-http-server (and the Golang net/http server).
| | * | | | FogBugz project importJared Szechy2015-09-085-0/+424
| | |/ / /
| | * | | Merge branch 'url-builder-fix-for-relative-urls' into 'master'Dmitriy Zaporozhets2015-09-071-6/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix URL construction for merge requests, issues, notes, and commits for relative URL config This MR fixes the constructor of URL links for systems using relative URLs in the application config. The `host` parameter was used improperly, supplying an extra path (e.g. https://mydomain.com/gitlab) and unnecessary scheme. We should be able to default to the URL options set in `8_default_url_options.rb` file. Closes https://github.com/gitlabhq/gitlabhq/issues/9605 See merge request !1250
| | | * | | 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 'upgrade-redis-required-check' into 'master'Marin Jankovski2015-09-071-3/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidekiq/pull/957 Closes #2222 Closes #2445 See merge request !1251
| | | * | | Upgrade Redis requirement check to 2.4.0 per ↵Stan Hu2015-09-061-4/+7
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mperham/sidekiq/pull/957 Closes #2222 Closes #2445
| | * | | Use File.join to prevent extra slash in help message from appearing. Before:Stan Hu2015-09-061-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | ``` Try fixing it: sudo -u git -H /opt/gitlab/embedded/service/gitlab-shell//bin/create-hooks ```
| | * | Fix `rake services:doc` generationStan Hu2015-09-031-3/+3
| | | | | | | | | | | | | | | | [ci skip]
| | * | Add API method for get user by ID of an SSH keyArtem V. Navrotskiy2015-09-033-0/+25
| | | |
| | * | 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-024-65/+161
| | |/ /
| | * | 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
| | | | |
| * | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-261-1/+1
| |\ \ \ \
| * | | | | Update gitignore, change literal DB table names, fix errors, fix fontawesomeDouwe Maan2015-08-261-3/+3
| | | | | |
| * | | | | Groundwork for merging CI into CEDouwe Maan2015-08-2536-10/+1719
| | | | | |
* | | | | | 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
| | | | | |
* | | | | | Remove all permission checking from Reference filtersRobert Speicher2015-09-012-15/+2
| |_|/ / / |/| | | |
* | | | | Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-0121-63/+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
| | | | | |
View Lorry Controller Status