summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into rename-ci-commitrename-ci-commitKamil Trzcinski2016-06-061-3/+23
|\
| * Merge branch 'tests/extend-specs-for-build-badge' into 'master' Rémy Coutable2016-06-061-3/+23
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend specs for builds badge ## What does this MR do? This MR extends specs for builds badge. ## Why was this MR needed? We added an edge case to specs, while trying to reproduce problem described in #17549 ## What are the relevant issue numbers? #17549 See merge request !4401
| | * Extend specs for builds badgetests/extend-specs-for-build-badgeGrzegorz Bizon2016-06-031-3/+23
| | | | | | | | | | | | Related to #17549
* | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-3/+3
|\ \ \ | |/ /
| * | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-0323-233/+1056
| |\ \
| * \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-3019-50/+118
| |\ \ \
| * \ \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-259-42/+452
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-184-0/+243
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-1811-80/+328
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
| * \ \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-112-1/+19
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1120-252/+650
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-061-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-032-0/+64
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9': Let contributors know where to start Ensure branch cleanup regardless of whether the import process succeeds Fix failing todo tests Reorder the todos because the use of the project finder attempts to order them differently Update target todo test to use a public project Use the project finder in the todos finder to limit todos to just ones within projects you have access to. Move filtering todos by projects not pending deletion into a scope on the todo model Reduce the filters on the todos joins project query by being explicit about the join Ensure we don't show TODOS for projects pending delete Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb Remove unused Issuable#is_assigned? method fixup! Don't allow merges with new commits fixup! Add `sha` parameter to MR accept API Reduce Namespace queries in UserReferenceFilter Added ReferenceFilter#nodes Returning enums in ReferenceFilter#each_node Don't allow merges with new commits Add `sha` parameter to MR accept API
| * | | | | | | | | Reduce Namespace queries in UserReferenceFilterbanzai-user-filter-queriesYorick Peterse2016-06-021-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes UserReferenceFilter so it operates using the following steps: 1. Grab all username references from the input document. 2. Query the corresponding Namespace objects using a single query. 3. Iterate over all nodes to build links while re-using the objects queried in step 2. The impact of these changes is that a comment mentioning 5 different usernames no longer runs 5 different queries (1 for every username), instead it only runs a single query.
| * | | | | | | | | Added ReferenceFilter#nodesYorick Peterse2016-06-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method returns an Array of the HTML nodes as yielded by ReferenceFilter#each_node. The method's return value is memoized to allow multiple calls without having to re-query the input document.
| * | | | | | | | | Returning enums in ReferenceFilter#each_nodeYorick Peterse2016-06-021-0/+36
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes ReferenceFilter#each_node so that when it's called without a block an Enumerator is returned.
* | | | | | | | | Rename Ci::Build commit to pipelineKamil Trzcinski2016-06-032-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-0121-233/+992
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate reference gathering from rendering This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query. cc @rspeicher @DouweM See merge request !3969
| * | | | | | | | Split Markdown rendering & reference gatheringYorick Peterse2016-05-2620-233/+955
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This splits the Markdown rendering and reference extraction phases into two distinct code bases. The reference extraction phase no longer relies on the html-pipeline Gem (and any related code) and allows for extracting of references from multiple HTML nodes in a single pass. This means that if you want to extract user references from 200 comments you no longer need to run 200 times N number of queries, instead only a handful of queries may be needed.
| * | | | | | | | Added Gitlab::LazyYorick Peterse2016-05-261-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class can be used to lazy-evaluate blocks of code the first time they're called. This can be useful when a method performs a certain heavy operation (e.g. a SQL query) that you only want to perform whenever the result is used for the first time.
* | | | | | | | | Merge branch 'current-settings-use-request-store-during-request'Douwe Maan2016-06-011-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Update tests for the current_application_settings request store changesDJ Mountney2016-05-271-2/+2
| | | | | | | | |
* | | | | | | | | Improve note factoryGrzegorz Bizon2016-05-291-8/+8
| | | | | | | | |
* | | | | | | | | Update specs to carry out changes in note factoryGrzegorz Bizon2016-05-291-17/+54
|/ / / / / / / /
* | | | | | | | Merge branch 'measure-proxy-timing' into 'master' Yorick Peterse2016-05-261-0/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Measure proxy flight time See merge request !4278
| * | | | | | | Rename metric to 'rails queue duration'Jacob Vosmaer2016-05-261-2/+2
| | | | | | | |
| * | | | | | | Test ProxyFlightTime middlewareJacob Vosmaer2016-05-251-0/+31
| | | | | | | |
* | | | | | | | Merge branch 'rs-rubocop-nottonot' into 'master' Dmitriy Zaporozhets2016-05-2517-33/+33
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable RSpec/NotToNot cop and auto-correct offenses Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761 See merge request !4267
| * | | | | | | Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonotRobert Speicher2016-05-2417-33/+33
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Also removes the note from the development/testing.md guide
* | | | | | | Replace \n to <br>Kamil Trzcinski2016-05-231-0/+9
|/ / / / / /
* | | | | | Fix Error 500 in CI charts by gracefully handling commits with no durationsStan Hu2016-05-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Closes #17730
* | | | | | Add specs for migration helpers and boolean valuesGrzegorz Bizon2016-05-221-0/+6
| | | | | |
* | | | | | Test migration helpers using a migration classGrzegorz Bizon2016-05-221-7/+5
| | | | | |
* | | | | | Merge branch 'zj-gitignore-dropdown'Douwe Maan2016-05-201-0/+40
|\ \ \ \ \ \
| * | | | | | Update API and fetching taskZeger-Jan van de Weg2016-05-201-1/+3
| | | | | | |
| * | | | | | Backend for a gitignores dropdownZeger-Jan van de Weg2016-05-201-0/+38
| | | | | | |
* | | | | | | Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'Douwe Maan2016-05-201-0/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/services/system_note_service.rb
| * | | | | | | Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler2016-05-181-0/+68
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Gitlab::Diff::InlineDiff
* | | | | | | Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' Douwe Maan2016-05-201-20/+131
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement special GitLab markdown reference for milestones https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions: - Move changelog item to 8.8 - Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829 See merge request !3897
| * | | | | | Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable2016-05-1824-178/+845
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eReGeBe/gitlab-ce-feature/milestone-md Signed-off-by: Rémy Coutable <remy@rymai.me>
| * \ \ \ \ \ \ Merge branch 'master' into eReGeBe/gitlab-ce-feature/milestone-mdDouwe Maan2016-04-234-114/+38
| |\ \ \ \ \ \ \
| * | | | | | | | Using project `path_with_namespace` in milestone's cross project references ↵Alejandro Rodríguez2016-04-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link text
| * | | | | | | | Escaping the `object_link_text` on cross project milestone referencesAlejandro Rodríguez2016-04-201-0/+6
| | | | | | | | |
| * | | | | | | | Consistently using iid when treating milestones as referrablesAlejandro Rodríguez2016-04-201-20/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, addint a suffix to the reference text when the milestone is in another project
* | | | | | | | | Merge branch '17464-backport-email-syntax-highlighting' into 'master' Douwe Maan2016-05-191-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syntax-highlight diffs in push emails ![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png) Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !4147
| * | | | | | | | | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlightingSean McGivern2016-05-171-1/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
* | | | | | | | | Merge branch 'migration-helpers' into 'master' Robert Speicher2016-05-191-0/+124
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added helper methods for database migrations These helpers can ultimately be used to write migrations that don't require downtime. See #15464 for more information. See merge request !3860
| * | | | | | | | Fixed styling per Rubocop pedanticsYorick Peterse2016-05-121-4/+4
| | | | | | | | |
| * | | | | | | | Added helper methods for database migrationsYorick Peterse2016-05-121-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These helpers can be used to perform migrations without taking down the entire application. For example, the method "add_column_with_default" can be used to add a new column with a default value without locking the entire table.
* | | | | | | | | Merge branch 'issue_17560' into 'master' Robert Speicher2016-05-192-21/+68
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mask credentials from URL when the import of project has failed. REF: #17560 See merge request !4185