summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'forks-count-cache' into 'master'Douwe Maan2017-08-151-1/+4
|\ | | | | | | | | Cache the number of forks of a project See merge request !13535
| * Cache the number of forks of a projectforks-count-cacheYorick Peterse2017-08-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | The number of forks of a project doesn't change very frequently and running a COUNT(*) every time this information is requested can be quite expensive. We also end up running such a COUNT(*) query at least twice on the homepage of a project. By caching this data and refreshing it when necessary we can reduce project homepage loading times by around 60 milliseconds (based on the timings of https://gitlab.com/gitlab-org/gitlab-ce).
* | Merge branch '34533-speed-up-group-project-authorizations' into 'master'Douwe Maan2017-08-153-8/+51
|\ \ | | | | | | | | | | | | | | | | | | Speed up Group#user_ids_for_project_authorizations Closes #36182 See merge request !13508
| * | Speed up Group#user_ids_for_project_authorizationsNick Thomas2017-08-143-8/+51
| | |
* | | Merge branch 'rs-remove-username-from-sanitize-attrs' into 'master'Rémy Coutable2017-08-141-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Remove `username` from `User#sanitize_attrs` callback See merge request !13511
| * | | Remove `username` from `User#sanitize_attrs` callbackrs-remove-username-from-sanitize-attrsRobert Speicher2017-08-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attribute is since validated against `DynamicPathValidator`, which has strict requirements for the characters allowed, and should no longer need to be sanitized in a callback before saving. This has additional benefits in our test suite, where every creation of a `User` record was calling `Sanitize.clean` on a username value that was always clean, since we're the ones generating it.
* | | | Use with_repo_branch_commit instead of fetch_ref directlyLin Jen-Shin2017-08-141-9/+8
| | | | | | | | | | | | | | | | | | | | So that we could limit the access to Repository#fetch_ref See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13416#note_37487433
* | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-1413-8/+380
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36089-handle-ref-failure-better * upstream/master: (47 commits) Update CHANGELOG.md for 9.4.5 Update charlock_holmes add a changelog entry switch to multi-line before block restructure the #new_key notification spec don't send devise notifications to the ghost user reset_delivered_emails before testing #new_key skip the :read_project check for new_project_member move the member spec to be with the other ones add a spec for new_group_member add a spec for never emailing the ghost user rubocop fix a membership with no user is always notifiable check notifiability for more emails add Member#notifiable?(type, opts) make NotificationRecipient a little more customizable Add notes about database performance for MySQL fix confidential border issue as well as confidential styles leaking on new MR Migrate force push check to Gitaly Add option to disable project export on instance ...
| * | | don't send devise notifications to the ghost userhttp://jneen.net/2017-08-111-0/+1
| | | |
| * | | skip the :read_project check for new_project_memberhttp://jneen.net/2017-08-111-1/+6
| | | | | | | | | | | | | | | | | | | | since we're just adding them as a member, the permission may still return false.
| * | | rubocop fixhttp://jneen.net/2017-08-111-2/+1
| | | |
| * | | a membership with no user is always notifiablehttp://jneen.net/2017-08-113-6/+14
| | | | | | | | | | | | | | | | since this is for user invites and the like.
| * | | add Member#notifiable?(type, opts)http://jneen.net/2017-08-113-0/+12
| | | |
| * | | make NotificationRecipient a little more customizablehttp://jneen.net/2017-08-111-3/+15
| | |/ | |/|
| * | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-111-0/+1
| |\ \ | | |/ | |/| | | | | | | Add option to disable project export on instance See merge request !13211
| | * Add option to disable project export on instanceRobin Bobbitt2017-08-111-0/+1
| | |
| * | Better caching and indexing of broadcast messagesYorick Peterse2017-08-111-2/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caching of BroadcastMessage instances has been changed so a cache stays valid as long as the default cache expiration time permits, instead of the cache being expired after 1 minute. When modifying broadcast messages the cache is flushed automatically. To remove the need for performing sequence scans on the "broadcast_messages" table we also add an index on (starts_at, ends_at, id), permitting PostgreSQL to use an index scan to get all necessary data. Finally this commit adds a few NOT NULL constraints to the table to match the Rails validations. Fixes gitlab-org/gitlab-ce#31706
| * Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-115-3/+307
| |\ | | | | | | | | | | | | Use a separate table for storing push events See merge request !12463
| | * Use a specialized class for querying eventsYorick Peterse2017-08-102-2/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'appearances-caching-and-schema' into 'master'Sean McGivern2017-08-111-0/+20
| |\ \ | | |/ | |/| | | | | | | | | | | | | Cache Appearance instances in Redis Closes #36066 and #31698 See merge request !13433
| | * Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | This caches the result of Appearance.first in a similar fashion to how ApplicationSetting instances are cached. We also add some NOT NULL constraints to the table and correct the timestamp types. Fixes gitlab-org/gitlab-ce#36066, fixes gitlab-org/gitlab-ce#31698
* | | Since now fetch_ref is reliable, we could just rely on itLin Jen-Shin2017-08-111-5/+5
| | |
* | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-114-12/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36089-handle-ref-failure-better * upstream/master: (62 commits) Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb. Docs: update user docs index Fix minor typos in views Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_spec Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4' Merge branch 'import-symlinks-9-3' into 'security-9-3' Fix wrong method call on prometheus histogram Document new all-in-one Helm chart - docs Fix 404 on link path Fix line numbers not matching up to code in code viewer. Hide overflow-x on collapsed sidebar removed global use of breakpoint checker Increase performance of the breakpoint size checker Filter sensitive query string parameters from NGINX access logs Added a template for database changes Render new issue link in failed job as a regular link instead of a UJS one Include RE2 in the upgrade docs Remove affix plugin from issuable sidebar with new navigation Fix linter error alternative route for download archive ...
| * | Merge branch 'mk-fix-case-insensitive-redirect-matching' into 'master'Sean McGivern2017-08-101-1/+9
| |\ \ | | |/ | |/| | | | | | | Fix conflicting redirect search See merge request !13357
| | * Remove unnecessary work for MySQLMichael Kozono2017-08-081-1/+9
| | |
| | * Fix conflicting redirect searchMichael Kozono2017-08-081-1/+1
| | |
| * | Prevent user from changing username with container registry tagsMichael Kozono2017-08-091-0/+8
| | |
| * | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-092-11/+11
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Don't try to create diffs if one of the branch is missingLin Jen-Shin2017-08-101-1/+2
| | | | | | | | | | | | Also fix a few tests
* | | Introduce MergeRequest#write_ref and Repository#write_refLin Jen-Shin2017-08-103-9/+21
| | | | | | | | | | | | so that we don't have to fetch it for non-forks
* | | Just detect exit status rather than check refLin Jen-Shin2017-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13416#note_37193731 So we just try a cheaper way to detect it if it works or not
* | | Fix some tests and report the error messageLin Jen-Shin2017-08-091-2/+2
| | |
* | | Detect if we didn't create the ref soonerLin Jen-Shin2017-08-091-1/+4
|/ /
* | Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absoluteblackst0ne2017-08-091-1/+1
| |
* | Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0810-19/+20
|\ \ | |/ |/| | | | | Add rubocop-gitlab-security gem See merge request !12177
| * Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0810-19/+20
| |
* | Merge branch ↵Rémy Coutable2017-08-081-7/+12
|\ \ | |/ |/| | | | | | | | | | | | | '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-one' into 'master' Resolve "API v4 allows setting a branch that doesn't exist as the default one" Closes #36010 See merge request !13359
| * Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-oneblackst0ne2017-08-081-7/+12
| |
* | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-083-17/+8
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's CommitService.FindCommit RPC Closes gitaly#402 See merge request !13094
| * | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-071-1/+1
| | |
| * | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-071-12/+2
| | | | | | | | | | | | | | | | | | 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-4/+5
| | |
* | | Merge branch 'master' into ideMike Greiling2017-08-077-37/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
| * \ \ Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-16/+7
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
| | * | Move locked_at removal to post-deployment migrationOswaldo Ferreira2017-08-071-0/+1
| | | |
| | * | Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-16/+6
| | | |
| * | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-071-11/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#find_commits_by_message to Gitaly Closes gitaly#443 See merge request !13268
| | * | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-071-11/+28
| | |/ / | | | | | | | | | | | | Closes gitaly#443
| * | | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-071-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Issuables: Move some code from create services to Sidekiq workers See merge request !13326