Commit Graph

63 Commits

Author SHA1 Message Date
GitLab Bot bdca097916 Add latest changes from gitlab-org/gitlab@master 2020-08-11 03:11:00 +00:00
GitLab Bot 4f5c8572e9 Add latest changes from gitlab-org/gitlab@master 2020-06-16 18:09:01 +00:00
Thong Kuah 73e848850c Add frozen_string_literal to spec/features
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-07-26 13:23:30 +12:00
Lin Jen-Shin 74399a9098
Show Test Automation Engineer for spec/feature as
reviewers.
2019-06-06 21:11:57 +08:00
Rémy Coutable 3a2abc1d50
Enable the Layout/ExtraSpacing cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24 13:05:45 +01:00
Heinrich Lee Yu 91f235df08 Fix tests 2018-11-13 15:27:42 +08:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
Imre Farkas 20dfe25c15 Export assigned issues in iCalendar feed 2018-05-31 14:01:04 +00:00
Jan Provaznik d10416e231 Fixed dashboard filtering tests 2018-04-03 20:19:20 +02:00
Takuya Noguchi 2b6307f6ad Enable RuboCop Style/RegexpLiteral 2018-02-01 02:06:07 +09:00
blackst0ne 27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Douwe Maan 294fa6fcdc Remove authentication using user.private_token 2017-11-02 11:39:02 +01:00
Stan Hu 4bfdf8406f Fix Error 500s when viewing user or group Atom feeds 2017-08-21 14:09:52 +02:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Robert Speicher fcc4ba16d5 Use `empty_project` where possible in spec/features/atom 2017-07-27 13:12:16 -04:00
Keifer Furzland 7e113b6824 Remove superfluous type defs in specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:52 +02:00
Robert Speicher eef068754a Merge branch 'master' into rs-sign_in 2017-07-06 12:43:51 -04:00
Robert Speicher 9eeba8fb49 Auto-correct ProjectPathHelper violations 2017-07-06 12:20:50 -04:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Robert Speicher e939bf7be1 Change gitlab_sign_in to sign_in where possible 2017-06-29 12:18:23 -04:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Robert Speicher 018ed2c42f Change `login_with` uses to `gitlab_sign_in`
Change single `login_via` use to `gitlab_sign_in_via`
2017-06-19 18:59:01 -05:00
Alexis Reigel dfc2542f55 use full caps RSS instead of rss 2017-05-24 22:29:59 +02:00
Alexis Reigel 6efe9c2f14 atom links with rss token instead of private token 2017-05-24 22:29:59 +02:00
Valery Sizov 79b8323d11 [Multiple issue assignees] Fix issue atom feed 2017-05-05 16:57:27 +03:00
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
Douwe Maan 0be3187a56 Pull preserve into render helpers 2017-04-28 11:37:19 -05:00
Rémy Coutable 153b594c06 Merge branch '28058-hide-emails-in-atom-feeds' into 'security'
Only show public emails in atom feeds

See merge request !2066
2017-03-20 18:45:45 -07:00
Eric Eastwood e6fc0207cb Use native unicode emojis
- gl_emoji for falling back to image/css-sprite when the browser
   doesn't support an emoji
 - Markdown rendering (Banzai filter)
 - Autocomplete
 - Award emoji menu
    - Perceived perf
    - Immediate response because we now build client-side
 - Update `digests.json` generation in gemojione rake task to be more
   useful and  include `unicodeVersion`

MR: !9437

See issues

 - #26371
 - #27250
 - #22474
2017-03-06 12:54:46 -06:00
Robert Speicher e051ef69e3 Merge branch '20890-comment-image-inline' into 'master'
Fix inline comment images by removing wrapper #20890

Closes #20890

See merge request !5804
2017-02-27 19:23:05 +00:00
Douwe Maan 1fe7501b49 Revert "Prefer leading style for Style/DotPosition"
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
2017-02-23 09:33:05 -06:00
Douwe Maan 206953a430 Prefer leading style for Style/DotPosition 2017-02-23 09:32:22 -06:00
Douwe Maan 7ea641b6d0 Enable Style/ColonMethodCall 2017-02-23 09:31:57 -06:00
Lucas Deschamps d84eb9abd6 Issues atom feed url reflect filters on dashboard
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-03 18:26:06 +01:00
Ebrahim Byagowi 7e3ff18523 Add RTL support to markdown renderer 2016-10-16 17:47:48 +03:30
Jared Deckard 2c0f375f13 Fix inline comment images by removing wrapper #20890 2016-08-13 18:31:26 -05:00
tiagonbotelho 519275c110 fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
Connor Shea c7b04841c0
Wrap images in divs with Banzai and limit max-height.
Add max-height to prevent images from displaying larger than the provided screen size.

Also fix a failing test and add a new one.
2016-06-27 09:16:07 -06:00
Alexander Matyushentsev e8bf8ec407 Apply reviewer notes: update CHANGELOG, adjust code formatting 2016-06-13 09:51:55 -07:00
Alexander Matyushentsev fcbb14f6b7 Move issue rendering tests into separate contexts 2016-06-13 09:41:34 -07:00
Alexander Matyushentsev af33338bbf Add more information into RSS fead for issues 2016-06-13 09:41:34 -07:00
connorshea b9abf938ed Wrap images in discussions and wikis with a link to the image source using ImageLinkFilter.
Resolves #14411.

See merge request !3464
2016-04-04 19:44:07 -06:00
Kamil Trzcinski c0ff4fdd99 Move CI admin builds and runners specs to correct directory [ci skip] 2015-12-14 13:06:59 +01:00
Kamil Trzciński c810234357 Merge branch 'ci-project-migrate' into 'master'
Ci Project migrate

- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.

In 8.4 or 8.5 we can remove redundant tables and columns.


See merge request !1987
2015-12-14 10:35:40 +00:00
Kamil Trzcinski e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00
Douwe Maan 22999a6fa6 Revert "Merge branch 'remove-redcloth' into 'master' "
This reverts commit e426c027b0, reversing
changes made to c3676aa156.
2015-12-11 16:16:07 +01:00
Douwe Maan 3fd1a36d74 Fix spec 2015-12-09 12:00:26 +01:00
Douwe Maan f87f6480b2 Use new routing helper 2015-09-08 17:53:16 +01:00
Stan Hu 359ed48638 Fix Style/AlignHash cop violations 2015-06-22 22:24:39 -07:00
Douwe Maan e4ac6bbf82 Merge branch 'atom-xhtml-squashed' into 'master'
Fix invalid Atom feeds when using emoji, horizontal rules, or images

This is a fix for issues #880, #723, #1113.

Markdown must be rendered to XHTML, not HTML, when generating summary content for Atom feeds. Otherwise, content-less tags like *img* and *hr* are not terminated and make the Atom XML invalid. Such tags are generated when issue descriptions, merge request descriptions, comments, or commit messages use emoji, horizontal rules, or images.

To pass this option through from the relevant Haml templates to the proper place in the `gfm()` method, a new method `gfm_with_options()` is introduced. It reuses the options dictionary passed to `markdown()` and interprets options `xhtml` and `parse_tasks` from it (the latter was a convenient replacement for `gfm_with_tasks()`). `xhtml` is already interpreted by Redcarpet::Render::HTML, but that alone was not sufficient, because the post-processing in `gfm()` would convert its XHTML tags back to HTML.

I found no way of passing additional optional options to the existing `gfm()` method without requiring updates to existing callers and without getting in the way of the existing optional arguments, but maybe someone who knows more about Ruby than I can think of one.

Thorough review appreciated since this is the first time I have used Ruby.

See merge request !344
2015-03-17 08:38:38 +00:00