summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* fix part of specsValery Sizov2015-09-143-98/+100
|
* rubocop satisfyValery Sizov2015-09-1414-118/+118
|
* Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-116-0/+83
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'rs-fix-highlighting' into 'master'Douwe Maan2015-09-111-0/+42
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Add specs for syntax_highlight JSRobert Speicher2015-09-101-0/+42
| | | | | | | | | | | | | | | | | | | | | Also makes it work when given a parent element containing a `.js-syntax-highlight` element so for dynamically-added things like notes or Markdown previews, we can more accurately target just the element we care about.
| * | Add comments and clean up test for !1274Stan Hu2015-09-101-3/+0
| |/
| * Merge branch 'rescue-syntax-highlighting-errors' into 'master'Robert Schilling2015-09-101-0/+22
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+22
| | | | | | | | | | | | Closes #2433
| * | Added service API endpoint to retrieve service parametersPetheo Bence2015-09-101-0/+10
| |/
| * Merge branch 'fix-emojis-relative-url' into 'master'Douwe Maan2015-09-093-0/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-063-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example: RELATIVE_URL_ROOT=/gitlab rspec Closes #1728
* | | Remove network from CIDmitriy Zaporozhets2015-09-111-54/+0
| | |
* | | CLeanup CI helpers since we dont use oauth any moreDmitriy Zaporozhets2015-09-112-118/+0
| | |
* | | Fix Ci::Ansi2html specDmitriy Zaporozhets2015-09-111-33/+34
| | |
* | | Fix ci commits features specsDmitriy Zaporozhets2015-09-111-6/+9
| | |
* | | Fix build features specsDmitriy Zaporozhets2015-09-112-39/+42
| | |
* | | Fix more testsDmitriy Zaporozhets2015-09-106-66/+16
| | |
* | | Convert ci features specs to v3Dmitriy Zaporozhets2015-09-1013-87/+87
| | |
* | | Fix part of CI api testsDmitriy Zaporozhets2015-09-109-142/+142
| | |
* | | Fix most of project specsDmitriy Zaporozhets2015-09-102-10/+10
| | |
* | | Fix commit specsDmitriy Zaporozhets2015-09-1017-248/+252
| | |
* | | Fix some issues with ci models specsDmitriy Zaporozhets2015-09-108-53/+53
| | |
* | | integration with gitlab authValery Sizov2015-09-091-50/+0
| | |
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-0938-234/+657
|\ \ \ | |/ /
| * | Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets2015-09-091-0/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global labels https://dev.gitlab.org/gitlab/gitlabhq/issues/2353 See merge request !1240
| | * | added spinach for glabal labelsglobal_labelsValery Sizov2015-09-031-0/+8
| | | |
| * | | FogBugz project importJared Szechy2015-09-082-0/+104
| | | |
| * | | Merge branch 'annotate-models' into 'master'Dmitriy Zaporozhets2015-09-079-69/+95
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Re-annotate models See merge request !1253
| | * | | Re-annotate modelsStan Hu2015-09-069-69/+95
| | | |/ | | |/|
| * | | Remove style attribute from textarea during ZenMode activationrs-dev-issue-2466Robert Speicher2015-09-041-0/+5
| |/ / | | | | | | | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2466
| * | add Content-Type header of raw image filepilsner2015-09-041-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add Content-Type header to fix a bug which IE can't show image in markdown when the image is from raw. modified: CHANGELOG modified: app/controllers/projects/raw_controller.rb modified: spec/controllers/projects/raw_controller_spec.rb
| * | Add API method for get user by ID of an SSH keyArtem V. Navrotskiy2015-09-031-0/+39
| |/
| * Merge branch 'fix-raw-controller-disposition' into 'master'Dmitriy Zaporozhets2015-09-021-0/+23
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the filename argument from Content-Disposition header This MR removes the filename argument from the `Content-Disposition` header to avoid RFC 5987 and RFC 6266 encoding issues. Some browsers (e.g. Internet Explorer) do not properly decode a Unicode string properly, and this can lead to odd filenames in the raw file download. This change allows the browser to determine the filename based on the URL. For example, if I have a file called `한글한글.pptx` and click to download it with the "Raw" button in the Files section, IE11 will ask: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/fdb688282c0d4564872deadb44c58b2c/image.png) If you look at the `Content-Disposition` field, you see this: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2b342b83ae1ec61fd31937163ace8ec5/image.png) Chrome, Firefox, and Safari seem to be able to handle UTF-8 encoded filenames, even though this is not standard. See: http://greenbytes.de/tech/tc2231/ Closes https://github.com/gitlabhq/gitlabhq/issues/9595 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829 I've also submitted a pull request to Rails to support RFC 6266: https://github.com/rails/rails/pull/21461 See merge request !1235
| | * Remove the filename argument from Content-Disposition header to avoidStan Hu2015-09-021-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC 5987 and RFC 6266 encoding issues. This change allows the browser to determine the filename based on the URL. See: http://greenbytes.de/tech/tc2231/ Closes https://github.com/gitlabhq/gitlabhq/issues/9595 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829
| * | Drone CI serviceKirilll Zaitsev2015-09-023-58/+169
| |/
| * Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-0111-51/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Make sure the `gfm` helper passes the required optionsRobert Speicher2015-08-311-1/+1
| | | | | | | | | | | | This adds some duplication, but this helper is temporary.
| | * Remove invalid spec for GitlabMarkdownHelperRobert Speicher2015-08-311-5/+0
| | |
| | * Reference filters no longer take a custom class context optionRobert Speicher2015-08-278-40/+0
| | |
| | * Restore the forwarded HTML options in link_to_gfmRobert Speicher2015-08-271-0/+10
| | |
| | * Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher2015-08-272-17/+7
| | | | | | | | | | | | | | | 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-011-0/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-0/+34
| | | | | | | | | | | | | | | | Also fix a number of issues where author/reporter names were not available.
| * | | Merge branch 'fix-branches-cache-after-merge' into 'master'Valery Sizov2015-09-012-1/+29
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire cache when merge request source branch was removed Re-implement !1160 for 8.0. Also we have tests for MergeWorker now! Yay :sparkles: Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1224
| | * | Expire cache when merge request source branch was removedfix-branches-cache-after-mergeDmitriy Zaporozhets2015-08-282-1/+29
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'dont-notify-users-without-project-access' into 'master'Robert Speicher2015-08-301-2/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't notify users without access to the project when they are (accidentally) mentioned in a note. Addresses #2366. See merge request !1216
| | * | | Don't notify users without access to the project when they are ↵dont-notify-users-without-project-accessDouwe Maan2015-08-261-2/+9
| | |/ / | | | | | | | | | | | | (accidentally) mentioned in a note.
| * | | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-2945-136/+2855
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan2015-08-275-53/+100
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply syntax highlighting to fenced code blocks client-side Instead of applying the syntax highlighting scheme class to these blocks server-side, we use Javascript and Gon to apply the user's color scheme (or the default) client-side. This will make it easier to cache these blocks in the future because they're no longer state-dependent. See merge request !1203
| | | * Re-add user_color_scheme helperRobert Speicher2015-08-261-23/+54
| | | | | | | | | | | | | | | | Update PreferencesHelper specs
View Lorry Controller Status