summaryrefslogtreecommitdiff
path: root/spec/fixtures
Commit message (Collapse)AuthorAgeFilesLines
* adds impersonator variable and makes sudo usage overall more clear24537-reenable-private-token-with-sudotiagonbotelho2016-12-072-0/+116
|
* add parsing support for incoming html emailhttp://jneen.net/2016-11-171-0/+140
|
* Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-0/+0
| | | | email token be reset
* Merge branch 'master' into issue-board-sidebarissue-board-sidebarPhil Hughes2016-10-262-4/+0
|\
| * Preserve note_type and position for notes from emailsLin Jen-Shin2016-10-202-4/+0
| | | | | | | | Closes #23208
* | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-191-1/+1
|\ \ | |/
| * Fix issue board related controllers to expose label priority per projectDouglas Barbosa Alexandre2016-10-191-1/+1
| |
* | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-193-0/+152
|\ \ | |/
| * Add JSON SchemaSean McGivern2016-10-131-0/+137
| |
| * Fix board relates specsDouglas Barbosa Alexandre2016-10-111-2/+1
| |
| * Add index action to Projects::BoardsController to return project boardsDouglas Barbosa Alexandre2016-10-112-0/+16
| |
* | Restore subscribe status in JSONPhil Hughes2016-10-071-1/+2
| |
* | Fix JSON Schema that validates data returned by board issues endpointDouglas Barbosa Alexandre2016-10-071-0/+1
|/
* Returns the total number of issues in the JSON responseDouglas Barbosa Alexandre2016-08-311-2/+13
|
* Fix JSON schema to issues in issue board listsissue-boards-label-text-colorDouglas Barbosa Alexandre2016-08-191-16/+24
|
* Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-182-0/+84
|\ | | | | | | | | | | Support slash commands in issues / MR description & comments See merge request !5021
| * Simplify the slash commands DSL to store action blocks instead of creating ↵Rémy Coutable2016-08-132-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | methods Other improvements: - Ensure slash commands autocomplete doesn't break when noteable_type is not given - Slash commands: improve autocomplete behavior and /due command - We don't display slash commands for note edit forms. - Add tests for reply by email with slash commands - Be sure to execute slash commands after the note creation in Notes::CreateService Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Make slash commands contextualRémy Coutable2016-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | - Return only slash commands that make sense for the current noteable - Allow slash commands decription to be dynamic Other improvements: - Add permission checks in slash commands definition - Use IssuesFinder and MergeRequestsFinder - Use next if instead of a unless block, and use splat operator instead of flatten Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Support slash commands in noteable description and notesRémy Coutable2016-08-131-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some important things to note: - commands are removed from noteable.description / note.note - commands are translated to params so that they are treated as normal params in noteable Creation services - the logic is not in the models but in the Creation services, which is the right place for advanced logic that has nothing to do with what models should be responsible of! - UI/JS needs to be updated to handle notes which consist of commands only - the `/merge` command is not handled yet Other improvements: - Don't process commands in commit notes and display a flash is note is only commands - Add autocomplete for slash commands - Add description and params to slash command DSL methods - Ensure replying by email with a commands-only note works - Use :subscription_event instead of calling noteable.subscribe - Support :todo_event in IssuableBaseService Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Fix matcher `match_response_schema`Douglas Barbosa Alexandre2016-08-172-0/+8
| |
* | Returns label description in JSON when listing lists/issuesDouglas Barbosa Alexandre2016-08-172-0/+4
| |
* | Returns label priority in JSON when listing lists/issuesDouglas Barbosa Alexandre2016-08-172-4/+8
| |
* | Include the Issue#assignee in the response when listing issuesDouglas Barbosa Alexandre2016-08-171-0/+6
| |
* | Return Issue#iid instead of id when listing issuesDouglas Barbosa Alexandre2016-08-171-2/+2
| |
* | Add endpoint to list issues for a specific board listDouglas Barbosa Alexandre2016-08-171-0/+30
| |
* | Projects::BoardsController#show returns a list of board listsDouglas Barbosa Alexandre2016-08-171-0/+35
|/
* Merge branch '13333-consider-updating-http-parser-rb-to-0-6-0' into 'master' Rémy Coutable2016-08-112-0/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the tinder gem by bare HTTP requests ## What does this MR do? It removes the `tinder` gem (used to talk to the Campfire API) and replaces its use by bare HTTP requests. ## Are there points in the code the reviewer needs to double check? N/A. ## Why was this MR needed? To simplify the potential dependency hell discussed in #13333. The initial issue was about updating `http_parser.rb` which was required by `twitter-stream` which was required by `tinder`. Those 3 gems are not needed anymore. ## What are the relevant issue numbers? #13333 ## Screenshots (if relevant) N/A. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #13333 See merge request !5758
| * Replace the tinder gem by bare HTTP requestsThomas Balthazar2016-08-112-0/+44
| |
* | Small refactor in Redis class and improved specsGabriel Mazetto2016-08-062-6/+6
| |
* | Specs for RedisConfigGabriel Mazetto2016-08-044-0/+43
|/ | | | Make sure :url is not present on RedisConfig.params after parsing
* Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-264-800/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (620 commits) Added '*.js.es6 gitlab-language=javascript' to .gitattributes Fix CI status icon link underline Update CHANGELOG after 8.10.1 Add CHANGELOG Add es6 gem Instrument Nokogiri parsing methods Fix backup restore Use project ID in repository cache to prevent stale data from persisting across projects Add iid to MR API response `WikiPage` should have a slug even when not persisted. ES6ify all the things! Make fork counter always clickable (!5463) Revert "Merge branch '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…" Fix CHANGELOG Add spec for dashes in paths Fix Error 500 when creating Wiki pages with hyphens or spaces Add links to the real markdown.md file for all GFM examples Remove magic comments from Ruby files (!5456) Ignore invalid trusted proxies in X-Forwarded-For header remove search_id for label dropdown filter ...
| * Merge branch 'discussion-model' into 'master' Robert Speicher2016-07-211-800/+0
| |\ | | | | | | | | | | | | | | | | | | Add Discussion model to represent MR/diff discussion Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/10325. See merge request !5376
| | * Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-201-800/+0
| | |
| * | Merge branch '4142-show-inline-video' into 'master' Rémy Coutable2016-07-212-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff) ## What does this MR do? It adds support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff). Most of the work was done by @hayesr in !3508 but a few improvements were still missing. ## Why was this MR needed? To be able to play uploaded videos in GitLab! ## What are the relevant issue numbers? Closes #4142. ## Screenshots ### Video players ![Screen_Shot_2016-07-19_at_18.44.09](/uploads/e85e531b455a41c3e66b26b356abaafd/Screen_Shot_2016-07-19_at_18.44.09.png) ----- ![Screen_Shot_2016-07-19_at_18.44.29](/uploads/05f52a812760210d1eae86a7f8fc48bc/Screen_Shot_2016-07-19_at_18.44.29.png) ----- ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Test `VideoLinkFilter` - [x] Test in `spec/features/markdown_spec.rb` - [x] Improve `spec/uploaders/file_uploader_spec.rb` - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5215
| | * | Remove VideoJS and clean the integrationRémy Coutable2016-07-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle videos in: - MD preview in notes: commit, issue/MR, MR diff - New notes in: commit, issue/MR, MR diff - Persisted notes in: commit, issue/MR, MR diff Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | First support of videos in issues, MRs and notesEric Hayes2016-07-191-0/+0
| | |/ | | | | | | | | | | | | * Registered video MIME types * Currently supporting browser-supported formats with extensions that match the mime type
| * | Default to manual input for `domain_whitelist`, syntax fixes and added new ↵Patricio Cano2016-07-181-0/+0
| | | | | | | | | | | | tests.
| * | Added the ability to block sign ups using a domain blacklist.Patricio Cano2016-07-181-0/+3
| |/
| * don't expect &quot; encoding anymorehttp://jneen.net/2016-07-141-6/+6
| |
* | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-156-20/+789
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1547 commits) Add margin between buttons if both retry and cancel are present Add margin between labels; remove underline hover style on status button udpated JS based on feedback Use default cursor for table header of project files (!5165) Fix duplicated entry in changelog [ci skip] Improves left static sidebar behaviour Include default callback URL (OAuth) Cleanup feature proposal template Simplify regex for string-based multi-word label surrounded in quotes Revert "Merge branch '18193-developers-can-merge' into 'master' " Upgrade Rails from 4.2.6 to 4.2.7. some JS magic to fix empty URL bug formats my test properly Update CHANGELOG Doesn't match empty label references surrounded in quotes Fix markdown rendering for label references that contains `.` Fix markdown rendering for label references that begin with a digit Fix markdown rendering for consecutive label references Stub omniauth provider for GitLab Update CHANGELOG ...
| * Merge branch 'better-parallel-diff' into 'master' Robert Speicher2016-07-131-27/+7
| |\ | | | | | | | | | | | | Actually render old and new sections of parallel diff next to each other See merge request !5173
| | * Actually render old and new sections of parallel diff next to each otherbetter-parallel-diffDouwe Maan2016-07-131-27/+7
| | |
| * | Add more comments to regexDouwe Maan2016-07-102-2/+2
| | |
| * | Add blockquote fence syntax to MarkdownDouwe Maan2016-07-092-0/+246
| |/
| * Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-061-4/+500
| |
| * optimize png images losslessly using zopflipngPeter Dave Hello2016-06-291-0/+0
| |
| * Show proper image ID on registry pageKamil Trzcinski2016-06-211-1/+16
| |
| * Add support for Docker Registry manifest v1Kamil Trzcinski2016-06-151-0/+32
| |
* | Merge branch 'master' into new-issue-by-emailLin Jen-Shin2016-06-153-4/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1246 commits) Update CHANGELOG Update tests to make it work with Turbolinks approach Use Turbolink instead of ajax Reinitialize checkboxes to toggle event bindings Turn off handlers before binding events Removed console.log Uses outerWidth instead of width Revert "Added API endpoint for Sidekiq Metrics" Added API endpoint for Sidekiq Metrics Added CHANGELOG entry for allocations Gem/name fix Filter out classes without names in the sampler Update the allocations Gem to 1.0.5 Put all sidebar icons in fixed width container Instrument private/protected methods Fix Ci::Build#artifacts_expire_in= when assigning invalid duration Fix grammar and syntax Update CI API docs UI and copywriting improvements Factorize members mails into a new Emails::Members module Factorize access request routes into a new :access_requestable route concern Factorize #request_access and #approve_access_request into a new AccessRequestActions controller concern ...
| * Set target="_blank" for external linksAlfredo Sumaran2016-06-081-1/+1
| |
View Lorry Controller Status