summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Don't escape html entities when rich == raw line36041-notification-titleJarka Kadlecova2017-08-173-27/+32
|
* Merge branch 'workhorse-deprecate-gitaly-address' into 'master'Douwe Maan2017-08-151-1/+0
|\ | | | | | | | | Remove deprecated field from workhorse API responses See merge request !13567
| * Remove deprecated field from workhorse API responsesworkhorse-deprecate-gitaly-addressJacob Vosmaer2017-08-151-1/+0
| |
* | Add two more project templateszj-add-two-more-project-templatesZ.J. van de Weg2017-08-151-1/+3
| | | | | | | | | | | | | | Related to !13108. Mostly this is just running the rake task and changing the task a bit to catch cases like the project already existing or so. The rake task moves archives to the vendor/project_template directory, which are checked in too.
* | Merge branch 'malformed-submodule' into 'master'Douwe Maan2017-08-152-4/+10
|\ \ | | | | | | | | | | | | Handle missing .gitmodules when getting submodule urls See merge request !13509
| * | Handle missing .gitmodules when getting submodule urlsmalformed-submoduleJacob Vosmaer2017-08-142-4/+10
| |/
* | Merge branch 'gitaly-404-commit-list-files' into 'master'Douwe Maan2017-08-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Migrate `Git::Repository.ls_files` to Gitaly Closes gitaly#404 See merge request !13302
| * | Migrate Git::Repository.ls_files to Gitalygitaly-404-commit-list-filesKim "BKC" Carlbäcker2017-08-101-1/+1
| | |
* | | Merge branch 'fix/thread-safe-gpgme-tmp-directory' into 'master'Dmitriy Zaporozhets2017-08-141-0/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix: Thread safe GPGME tmp directory Closes #35986 See merge request !13481
| * | | use mutex for keychain interactionAlexis Reigel2017-08-141-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting of the gpg home directory is not thread safe, as the directoy gets stored on the class. if multiple threads change the directory at the same time, one of the threads will be working in the wrong directory.
| * | | store gpg return directory locallyAlexis Reigel2017-08-111-0/+22
| | | |
* | | | Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-141-0/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't rename system when migrating from 9.x -> 9.4 Closes #35525 and #36148 See merge request !13228
| * | | | Move the personal snippet uploads from `system` to `-/system`bvl-rollback-renamed-system-namespaceBob Van Landuyt2017-08-111-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | Update the markdown unconditionally since the move might have been done before, but the markdown not updated.
* | | | | Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'Robert Speicher2017-08-112-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrate force push check to Gitaly See merge request !13406
| * | | | | Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-112-2/+4
| | |_|/ / | |/| | |
* | | | | Merge branch '32004-use-timecop-safe-mode' into 'master'Robert Speicher2017-08-112-17/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Enable Timecop safe mode Closes #32004 See merge request !13498
| * | | | Enable Timecop safe mode32004-use-timecop-safe-modeRémy Coutable2017-08-112-17/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'rc/32308-rspec-retry-hack' into 'master'Sean McGivern2017-08-114-6/+371
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Detect and keep track of flaky specs See merge request !13021
| * | | | Use a new RspecFlakyListener to detect flaky specsRémy Coutable2017-08-114-6/+371
| |/ / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-115-1/+457
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Use a separate table for storing push events See merge request !12463
| * | | Use a specialized class for querying eventsYorick Peterse2017-08-101-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes various controllers to use the new EventCollection class for retrieving events. This class uses a JOIN LATERAL query on PostgreSQL to retrieve queries in a more efficient way, while falling back to a simpler / less efficient query for MySQL. The EventCollection class also includes a limit on the number of events to display to prevent malicious users from cycling through all events, as doing so could put a lot of pressure on the database. JOIN LATERAL is only supported on PostgreSQL starting with version 9.3.0 and as such this optimisation is only used when using PostgreSQL 9.3 or newer.
| * | | Migrate events into a new formatYorick Peterse2017-08-104-1/+435
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit migrates events data in such a way that push events are stored much more efficiently. This is done by creating a shadow table called "events_for_migration", and a table called "push_event_payloads" which is used for storing push data of push events. The background migration in this commit will copy events from the "events" table into the "events_for_migration" table, push events in will also have a row created in "push_event_payloads". This approach allows us to reclaim space in the next release by simply swapping the "events" and "events_for_migration" tables, then dropping the old events (now "events_for_migration") table. The new table structure is also optimised for storage space, and does not include the unused "title" column nor the "data" column (since this data is moved to "push_event_payloads"). == Newly Created Events Newly created events are inserted into both "events" and "events_for_migration", both using the exact same primary key value. The table "push_event_payloads" in turn has a foreign key to the _shadow_ table. This removes the need for recreating and validating the foreign key after swapping the tables. Since the shadow table also has a foreign key to "projects.id" we also don't have to worry about orphaned rows. This approach however does require some additional storage as we're duplicating a portion of the events data for at least 1 release. The exact amount is hard to estimate, but for GitLab.com this is expected to be between 10 and 20 GB at most. The background migration in this commit deliberately does _not_ update the "events" table as doing so would put a lot of pressure on PostgreSQL's auto vacuuming system. == Supporting Both Old And New Events Application code has also been adjusted to support push events using both the old and new data formats. This is done by creating a PushEvent class which extends the regular Event class. Using Rails' Single Table Inheritance system we can ensure the right class is used for the right data, which in this case is based on the value of `events.action`. To support displaying old and new data at the same time the PushEvent class re-defines a few methods of the Event class, falling back to their original implementations for push events in the old format. Once all existing events have been migrated the various push event related methods can be removed from the Event model, and the calls to `super` can be removed from the methods in the PushEvent model. The UI and event atom feed have also been slightly changed to better handle this new setup, fortunately only a few changes were necessary to make this work. == API Changes The API only displays push data of events in the new format. Supporting both formats in the API is a bit more difficult compared to the UI. Since the old push data was not really well documented (apart from one example that used an incorrect "action" nmae) I decided that supporting both was not worth the effort, especially since events will be migrated in a few days _and_ new events are created in the correct format.
* | | Merge branch ↵Yorick Peterse2017-08-111-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36328-deserializemergerequestdiffsandcommits-fails-due-to-null-too_large-column-9-5-rc1' into 'master' Fix merge request diff deserialisation when too_large was absent Closes #36328 See merge request !13500
| * | | Fix merge request diff deserialisation when too_large was absentSean McGivern2017-08-111-0/+11
| | | | | | | | | | | | | | | | | | | | Not all diffs in st_diffs had the too_large attribute set at all, but the column is non-nullable. Explicitly cast to boolean to avoid that problem.
* | | | Enable the RSpec/HookArgument cop and auto-correct offensesRobert Speicher2017-08-107-16/+16
|/ / /
* | | Merge branch 'jej/security-release-2017-08-10' into 'master'Stan Hu2017-08-102-0/+39
|\ \ \ | | | | | | | | | | | | | | | | Security release 2017-08-10 patch See merge request !13477
| * | | Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'jej/security-release-2017-08-10James Edwards-Jones2017-08-101-0/+34
| | | | | | | | | | | | | | | | | | | | Ensure user and hostnames begin with an alnum character in UrlBlocker See merge request !2138
| * | | Merge branch 'import-symlinks-9-3' into 'security-9-3'James Edwards-Jones2017-08-101-0/+5
| |/ / | | | | | | | | | | | | Fix file disclosure via hidden symlinks using the project import (9.3) See merge request !2164
* | | Improve the Project factory to make `creator` defaults to namespace.ownerRémy Coutable2017-08-102-64/+24
|/ / | | | | | | | | | | | | | | Also improves the `create_templates` transient attribute and use `project.project_feature.update_columns` instead of `project.project_feature.update_attributes!` since it's faster. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Rename RPC 'Exists' to 'RepositoryExists'Jacob Vosmaer2017-08-091-19/+0
| |
* | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-0916-27/+27
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-084-48/+62
|\ | | | | | | | | | | | | Incorporate Gitaly's CommitService.FindCommit RPC Closes gitaly#402 See merge request !13094
| * Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-072-1/+18
| |
| * Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-073-13/+5
| | | | | | | | | | | | This helps keep the abstraction layers simpler, and also keep the interface of those methods consistent, in case of implementation changes.
| * Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-073-34/+39
| |
* | Make sure that we have author and committerLin Jen-Shin2017-08-081-0/+3
| | | | | | | | In case we don't have it setup in ~/.gitconfig
* | Add a test to show that threshold 40 would corrupt35098-raise-encoding-confidence-thresholdLin Jen-Shin2017-08-081-0/+44
| | | | | | | | | | | | | | | | | | | | | | If we set `ENCODING_CONFIDENCE_THRESHOLD` to 40, this test case would not pass. If we raise to 50, this would pass. Note that if in the future rugged didn't return corrupt data, this would be less relevant. But still icu recommend the threshold to be 50, we should just stick with 50.
* | Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-082-10/+0
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
| * | Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-072-10/+0
| | |
* | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-073-16/+160
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE Closes #21391 See merge request !13275
| * | Backport changes in ↵Nick Thomas2017-08-073-16/+160
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
* | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-071-0/+71
|\ \ \ | | | | | | | | | | | | | | | | Add Gitlab::Git::Blob.batch method See merge request !13225
| * | | Rename 'limit' to 'blob_size_limit'Jacob Vosmaer2017-08-071-5/+5
| | | |
| * | | Add Gitlab::Git::Blob.batch methodJacob Vosmaer2017-08-011-0/+71
| | | |
* | | | Merge branch 'github' into 'master'Robert Speicher2017-08-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitHub importer Closes #27429 See merge request !12886
| * | | | Set the new GitHub import as import sourceDouglas Barbosa Alexandre2017-08-071-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-071-0/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to be started from a template Closes #32420 See merge request !13108
| * | | | After merge cleanupZ.J. van de Weg2017-08-071-1/+1
| | | | |
| * | | | Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-07292-1021/+2214
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
| * | | | | Rename GitLabProjectImporterService and misc fixesZ.J. van de Weg2017-08-011-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First round of review, main changes: - templates.title is human readable, #name will be passed around - GitLabProjectImporterService has been renamed