summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Check public snippets for spamSean McGivern2017-02-021-0/+1
| | | | | | Apply the same spam checks to public snippets (either personal snippets that are public, or public snippets on public projects) as to issues on public projects.
* update specfix/import-user-validation-errorJames Lopez2017-01-311-6/+2
|
* add spec replicating validation errorJames Lopez2017-01-311-0/+28
|
* Merge branch ↵Kamil Trzciński2017-01-314-4/+4
|\ | | | | | | | | | | | | | | | | | | '25910-convert-manual-action-icons-to-svg-to-propperly-position-them' into 'master' Convert pipeline action icons to svg to have them propperly positioned Closes #25910 See merge request !8766
| * Fix broken testsFilipa Lacerda2017-01-254-4/+4
| | | | | | | | Fix linter error
* | fix typo in specJames Lopez2017-01-301-1/+1
| |
* | programmatically remove encrypted attributes. Added relevant spec.James Lopez2017-01-301-0/+11
| |
* | fix spec failuresJames Lopez2017-01-301-2/+2
| |
* | fix typoJames Lopez2017-01-301-2/+2
| |
* | Ignore encrypted attributes in Import/ExportJames Lopez2017-01-302-4/+23
| | | | | | | | | | | | | | * Regenerates tokens for all models that have them * Remove variables, since they are basically just storing encrypted data * Bumped version up to 0.1.6 * Updated related docs
* | Merge branch '26943-fix-user-in-build-presenter' into 'master' Robert Speicher2017-01-273-17/+19
|\ \ | | | | | | | | | | | | | | | | | | Don't override Ci::Build#user when presenting a build Closes #26943 See merge request !8668
| * | Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee ↵26943-fix-user-in-build-presenterRémy Coutable2017-01-251-4/+3
| | | | | | | | | | | | | | | | | | already respond to method Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Don't override presentee methods for Gitlab::View::Presenter::DelegatedRémy Coutable2017-01-243-17/+20
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'fix-trace-reader-encoding' into 'master' Douwe Maan2017-01-261-2/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make sure TraceReader uses Encoding.default_external Closes #27052 See merge request !8801
| * | | Make sure TraceReader uses Encoding.default_externalfix-trace-reader-encodingLin Jen-Shin2017-01-261-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encoding.default_external was chosen over Encoding.default_internal because File.read is returning Encoding.default_external, therefore we should align with it. Alternatively, we could force both of them to be Encoding.default_internal. However, ideally this should be determined by different projects. For example, some projects might want to use an encoding different to what GitLab is using. This might not happen soon though. Closes #27052
* | | | Merge branch 'rs-empty_project-lib' into 'master' Rémy Coutable2017-01-2665-103/+114
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use `:empty_project` where possible throughout spec/lib See merge request !8767
| * | | | Use `:empty_project` where possible throughout spec/librs-empty_project-libRobert Speicher2017-01-2565-103/+114
| | | | |
* | | | | Revert "Make sure TraceReader uses Encoding.default_external"Lin Jen-Shin2017-01-261-14/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit e9d8fc94e6e13f8b2d145f549d4a939ca25a3d93.
* | | | | Make sure TraceReader uses Encoding.default_externalLin Jen-Shin2017-01-261-2/+14
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encoding.default_external was chosen over Encoding.default_internal because File.read is returning Encoding.default_external, therefore we should align with it. Alternatively, we could force both of them to be Encoding.default_internal. However, ideally this should be determined by different projects. For example, some projects might want to use an encoding different to what GitLab is using. This might not happen soon though. Closes #27052
* | | | Merge branch 'copy-as-md' into 'master' Jacob Schatz2017-01-251-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Copying a rendered issue/comment will paste into GFM textareas as actual GFM See merge request !8597
| * \ \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-252-20/+72
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| * | | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-2417-123/+806
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-1932-137/+525
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/lib/utils/common_utils.js.es6
| * | | | | | Fix SyntaxHighlightFilter specDouwe Maan2017-01-171-4/+4
| | | | | | |
* | | | | | | Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-254-0/+106
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race conditions for AuthorizedProjectsWorker Closes #26194 and #26310 See merge request !8701
| * | | | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-254-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two cases that could be problematic: 1. Because sometimes AuthorizedProjectsWorker would be scheduled in a transaction it was possible for a job to run/complete before a COMMIT; resulting in it either producing an error, or producing no new data. 2. When scheduling jobs the code would not wait until completion. This could lead to a user creating a project and then immediately trying to push to it. Usually this will work fine, but given enough load it might take a few seconds before a user has access. The first one is problematic, the second one is mostly just annoying (but annoying enough to warrant a solution). This commit changes two things to deal with this: 1. Sidekiq scheduling now takes places after a COMMIT, this is ensured by scheduling using Rails' after_commit hook instead of doing so in an arbitrary method. 2. When scheduling jobs the calling thread now waits for all jobs to complete. Solution 2 requires tracking of job completions. Sidekiq provides a way to find a job by its ID, but this involves scanning over the entire queue; something that is very in-efficient for large queues. As such a more efficient solution is necessary. There are two main Gems that can do this in a more efficient manner: * sidekiq-status * sidekiq_status No, this is not a joke. Both Gems do a similar thing (but slightly different), and the only difference in their name is a dash vs an underscore. Both Gems however provide far more than just checking if a job has been completed, and both have their problems. sidekiq-status does not appear to be actively maintained, with the last release being in 2015. It also has some issues during testing as API calls are not stubbed in any way. sidekiq_status on the other hand does not appear to be very popular, and introduces a similar amount of code. Because of this I opted to write a simple home grown solution. After all, all we need is storing a job ID somewhere so we can efficiently look it up; we don't need extra web UIs (as provided by sidekiq-status) or complex APIs to update progress, etc. This is where Gitlab::SidekiqStatus comes in handy. This namespace contains some code used for tracking, removing, and looking up job IDs; all without having to scan over an entire queue. Data is removed explicitly, but also expires automatically just in case. Using this API we can now schedule jobs in a fork-join like manner: we schedule the jobs in Sidekiq, process them in parallel, then wait for completion. By using Sidekiq we can leverage all the benefits such as being able to scale across multiple cores and hosts, retrying failed jobs, etc. The one downside is that we need to make sure we can deal with unexpected increases in job processing timings. To deal with this the class Gitlab::JobWaiter (used for waiting for jobs to complete) will only wait a number of seconds (30 by default). Once this timeout is reached it will simply return. For GitLab.com almost all AuthorizedProjectWorker jobs complete in seconds, only very rarely do we spike to job timings of around a minute. These in turn seem to be the result of external factors (e.g. deploys), in which case a user is most likely not able to use the system anyway. In short, this new solution should ensure that jobs are processed properly and that in almost all cases a user has access to their resources whenever they need to have access.
* | | | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-251-0/+24
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Support notes without a project (personal snippets notes) See merge request !8468
| * | | | | | address commentsJarka Kadlecova2017-01-251-0/+3
| | | | | | |
| * | | | | | make mentions working when project not specifiedJarka Kadlecova2017-01-181-0/+21
| | | | | | |
* | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-241-20/+48
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Dont persist application settings in test env See merge request !8715
| * | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-231-20/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e.
* | | | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into ↵Sean McGivern2017-01-241-0/+115
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allows to search within project by commit's hash #24833 Closes #24833 See merge request !8028
| * | | | | | Allows to search within project by commit's hashYarNayar2017-01-241-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Was proposed in #24833
* | | | | | | Merge branch ↵Douwe Maan2017-01-235-3/+106
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22619-add-an-email-address-to-unsubscribe-list-header-in-email' into 'master' Handle unsubscribe notification via email Closes #22619 See merge request !6597
| * | | | | | | Handles unsubscribe from notifications via emailPawel Chojnacki2017-01-135-3/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - allows unsubscription processing of email in format "reply+%{key}+unsubscribe@acme.com" (example) - if config.address includes %{key} and replies are enabled every unsubscriable message will include mailto: link in its List-Unsubscribe header
* | | | | | | | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' Douwe Maan2017-01-231-1/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow creating protected branches when user can merge to such branch Closes #22638 See merge request !8458
| * | | | | | | Allow creating protected branch when it doesn't existPawel Chojnacki2017-01-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if user has either push or merge permissions + Change log entry for fix to creating a branch matching a wildcard fails
* | | | | | | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' Kamil Trzciński2017-01-237-110/+471
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a warning icon for a stage with allowed to fail builds Closes #21948 See merge request !8503
| * | | | | | | Extend pipeline detailed status factory specsGrzegorz Bizon2017-01-121-17/+28
| | | | | | | |
| * | | | | | | Fix a Rubocop offense in detailed status factoryGrzegorz Bizon2017-01-121-1/+1
| | | | | | | |
| * | | | | | | Use detailed status for failed but allowed buildsGrzegorz Bizon2017-01-121-12/+113
| | | | | | | |
| * | | | | | | Expose methods that match statuses in status factoriesGrzegorz Bizon2017-01-121-17/+45
| | | | | | | |
| * | | | | | | Make it possible to combine extended CI/CD statusesGrzegorz Bizon2017-01-121-7/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also makes it possible to configure exclusive groups. There can be only one detailed status matched within an exclusive group, which is important from the performance perspective.
| * | | | | | | Add extended status for build failed but allowed toGrzegorz Bizon2017-01-111-0/+110
| | | | | | | |
| * | | | | | | Add specs for two new methods defined in stage classGrzegorz Bizon2017-01-111-1/+0
| | | | | | | |
| * | | | | | | Add concrete success warning status to stage factoryGrzegorz Bizon2017-01-114-71/+100
| | | | | | | |
| * | | | | | | Extract abstract success with warnings CI/CD statusGrzegorz Bizon2017-01-112-2/+2
| | | | | | | |
* | | | | | | | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into ↵Grzegorz Bizon2017-01-211-48/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !8573
* | | | | | | | Merge branch 'fix/import-users' into 'master' Rémy Coutable2017-01-202-9/+83
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import no longer mapping users as admin Closes #25346 See merge request !8625
| * | | | | | | | fix member mapper specfix/import-usersJames Lopez2017-01-201-24/+1
| | | | | | | | |
View Lorry Controller Status