summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Tim Zallmann2017-08-311-0/+32
|\ | | | | | | | | | | | | | | | | '31273-creating-an-project-within-an-internal-sub-group-gives-the-option-to-set-it-a-public' into 'master' Resolve various visibility level settings issues Closes #31273 See merge request !13442
| * Add check for access to NamespaceRubén Dávila2017-08-301-0/+32
| |
* | Merge branch 'zj-disable-pages-in-subgroups' into 'master'Grzegorz Bizon2017-08-311-1/+12
|\ \ | | | | | | | | | | | | | | | | | | Don't show references to Pages when not available Closes #34864 See merge request !13888
| * | Don't show references to Pages when not availableZeger-Jan van de Weg2017-08-311-1/+12
| | | | | | | | | | | | | | | | | | | | | In this instance its subgroups, and given we can't deploy it, we shouldn't allow it to be shown. Fixes gitlab-org/gitlab-ce#34864
* | | Merge branch '28938-password-change-workflow-for-admins' into 'master'Sean McGivern2017-08-311-12/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Changes the password change workflow for admins. Closes #28938 See merge request !13901
| * | | Changes the password change workflow for admins.28938-password-change-workflow-for-adminsTiago Botelho2017-08-311-12/+20
| | |/ | |/|
* | | Add filter by my reactionHiroyuki Sato2017-08-301-0/+38
| | |
* | | replace `is_spam?` with `spam?`Maxim Rydkin2017-08-293-8/+8
| |/ |/|
* | Merge branch 'sh-add-spec-to-protected-tags-deletion' into 'master'Robert Speicher2017-08-281-0/+17
|\ \ | |/ |/| | | | | Add spec for deleting protected tags See merge request !13693
| * Add spec for deleting protected tagssh-add-spec-to-protected-tags-deletionStan Hu2017-08-201-0/+17
| |
* | Fix inability to test some project integrationsfix-broken-testing-of-some-integrationsRubén Dávila2017-08-221-10/+32
|/
* Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-145-8/+138
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-142-6/+6
| |\ | | | | | | | | | | | | | | | | | | Don't rename system when migrating from 9.x -> 9.4 Closes #35525 and #36148 See merge request !13228
| | * Make sure uploads for personal snippets are correctly renderedBob Van Landuyt2017-08-112-6/+6
| | |
| * | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-111-0/+112
| |\ \ | | | | | | | | | | | | | | | | Add option to disable project export on instance See merge request !13211
| | * | Add option to disable project export on instanceRobin Bobbitt2017-08-111-0/+112
| | |/
| * | Merge branch '35435-pending-delete-project-error-in-admin-interface-fix' ↵Douwe Maan2017-08-111-0/+12
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | into 'master' Pending delete projects no longer return 500 error in Admins projects view Closes #35435 See merge request !13389
| | * Pending delete projects no longer return 500 error in Admins projects view35435-pending-delete-project-error-in-admin-interface-fixTiago Botelho2017-08-111-0/+12
| | |
| * | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-111-2/+8
| |\ \ | | | | | | | | | | | | | | | | Use a separate table for storing push events See merge request !12463
| | * | Migrate events into a new formatYorick Peterse2017-08-101-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-112-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36089-handle-ref-failure-better * upstream/master: Fix merge request diff deserialisation when too_large was absent Bumps omniauth-ldap gem version to 2.0.4 Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rb Remove documentation about rules that are now enforced by RuboCop Enable the RSpec/HookArgument cop and auto-correct offenses
| * | | Enable the RSpec/HookArgument cop and auto-correct offensesRobert Speicher2017-08-102-2/+2
| | |/ | |/|
* | | Just use the repo. Not sure why master could passLin Jen-Shin2017-08-111-2/+2
| | | | | | | | | | | | | | | It keeps giving me no repo error from setting up autocrlf, which shouldn't have anything to do with this merge request.
* | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-117-88/+67
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | Fix and improve spec/controllers/autocomplete_controller_spec.rbrc/improve-projects-factoryRémy Coutable2017-08-101-77/+56
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-096-11/+11
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Fix more testsLin Jen-Shin2017-08-111-0/+2
| |
* | Don't try to create diffs if one of the branch is missingLin Jen-Shin2017-08-101-1/+1
| | | | | | | | Also fix a few tests
* | Fix some tests and report the error messageLin Jen-Shin2017-08-091-1/+1
|/
* Merge branch 'master' into ideMike Greiling2017-08-074-1/+64
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
| * Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-043-0/+63
| |
| * fix #3686 make tarball download url to end with extensionhaseeb2017-08-031-1/+1
| |
* | Fix blob_controller_spec plain to raw_pathLuke "Jared" Bennett2017-08-041-1/+1
| |
* | Merge branch 'master' into ideDouwe Maan2017-08-0360-140/+109
|\ \ | |/
| * Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-0260-97/+97
| |
| * Merge branch 'rs-issuables-list-metadata-shared-examples' into 'master'Rémy Coutable2017-08-021-1/+3
| |\ | | | | | | | | | | | | Make the 'issuables list meta-data' shared example less dangerous See merge request !13236
| | * Make the 'issuables list meta-data' shared example less dangerousrs-issuables-list-metadata-shared-examplesRobert Speicher2017-08-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shared example would take an object's database ID and create a number of objects based on it. If for some reason the ID were a high number, like 20, this would create `20 + 21 + 22` objects. Not only was this dangerous from a performance perspective, it was entirely unnecessary, as the behavior it was testing is already well-tested in the unit test for the underlying object. For a controller test, which is what's including this shared example, all we need to do is verify that the assigned object contains the correct `id => object` Hash, which is what we now test for.
| * | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-0113-33/+33
| |/
| * Merge branch '28283-legacy-storage-format' into 'master'Sean McGivern2017-08-014-8/+8
| |\ | | | | | | | | | | | | [CE] Added Legacy Storage format See merge request !13149
| | * Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-014-8/+8
| | |
| * | Add option to use CommitLanguages RPCJacob Vosmaer2017-08-011-33/+0
| |/
* | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-311-1/+61
|\ \ | |/
| * Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-281-1/+61
| |\ | | | | | | | | | | | | | | | | | | Fix replying to commit comments on merge requests created from forks Closes #31772 See merge request !13137
| | * Fix replying to commit comments on MRs from forksSean McGivern2017-07-281-1/+61
| | | | | | | | | | | | | | | | | | A commit comment shows in the MR, but if the MR is from a fork, it will have a different project ID to the MR's target project. In that case, add an note_project_id param so that we can pick the correct project for the note.
* | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2811-37/+119
|\ \ \ | |/ /
| * | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' ↵Tim Zallmann2017-07-281-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Transform user profile javascript into async bundle" Closes #35224 See merge request !12929
| | * | fix broken testsMike Greiling2017-07-191-2/+2
| | | |
| * | | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-272-4/+9
| | |/ | |/|
| * | Remove superfluous type defs in specsKeifer Furzland2017-07-271-1/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' ↵Sean McGivern2017-07-261-0/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fixes 500 error caused by pending delete projects in admin dashboard Closes #35453 See merge request !13067