summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add a changelog entrybugfix.silence-on-disabled-notificationshttp://jneen.net/2017-08-111-0/+6
|
* switch to multi-line before blockhttp://jneen.net/2017-08-111-1/+3
|
* restructure the #new_key notification spechttp://jneen.net/2017-08-111-11/+6
|
* don't send devise notifications to the ghost userhttp://jneen.net/2017-08-111-0/+1
|
* reset_delivered_emails before testing #new_keyhttp://jneen.net/2017-08-111-0/+1
| | | | since the mere act of creating the key sends an email :|
* skip the :read_project check for new_project_memberhttp://jneen.net/2017-08-112-2/+7
| | | | | since we're just adding them as a member, the permission may still return false.
* move the member spec to be with the other oneshttp://jneen.net/2017-08-111-30/+52
| | | | and add one
* add a spec for new_group_memberhttp://jneen.net/2017-08-111-0/+30
|
* add a spec for never emailing the ghost userhttp://jneen.net/2017-08-111-0/+8
|
* 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.
* check notifiability for more emailshttp://jneen.net/2017-08-112-15/+72
|
* 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 '36166_confi_polish_one' into 'master'Clement Ho2017-08-113-20/+5
|\ | | | | | | | | | | | | fix confidential border issue as well as confidential styles leaking on new MR Closes gitlab-ee#3121 See merge request !13388
| * fix confidential border issue as well as confidential styles leaking on new MRRegis Boudinot2017-08-113-20/+5
|/
* Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'Robert Speicher2017-08-117-13/+24
|\ | | | | | | | | Migrate force push check to Gitaly See merge request !13406
| * Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-117-13/+24
| |
* | Merge branch 'import-project-modal-fix' into 'master'docs-group-milestonesFilipa Lacerda2017-08-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fixes the correct import modal window not showing Closes #36318 See merge request !13490
| * | Fixes the correct import modal window not showingimport-project-modal-fixPhil Hughes2017-08-111-1/+1
| | | | | | | | | | | | Closes #36318
* | | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-1115-39/+210
|\ \ \ | | | | | | | | | | | | | | | | Add option to disable project export on instance See merge request !13211
| * | | Add option to disable project export on instanceRobin Bobbitt2017-08-1113-38/+194
| | | |
| * | | Add option to disable project export on instance - db changesRobin Bobbitt2017-08-112-1/+16
| | | |
* | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-08-111-11/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix formatting of patch_versions.md See merge request !13503
| * | | | Fix formatting of patch_versions.mdJan Bruckner2017-08-111-11/+7
| | | | | | | | | | | | | | | [skip ci]
* | | | | Merge branch 'rs-coverage-updates' into 'master'Rémy Coutable2017-08-116-26/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Better categorize test coverage results See merge request !13485
| * | | | | Better categorize test coverage resultsrs-coverage-updatesRobert Speicher2017-08-116-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | Also marks a few things as uncovered, and removes an unused class.
* | | | | | Merge branch '32004-use-timecop-safe-mode' into 'master'Robert Speicher2017-08-118-48/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Timecop safe mode Closes #32004 See merge request !13498
| * | | | | | Enable Timecop safe mode32004-use-timecop-safe-modeRémy Coutable2017-08-118-48/+26
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'broadcast-messages-cache' into 'master'Sean McGivern2017-08-116-8/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better caching and indexing of broadcast messages Closes #31706 See merge request !13429
| * | | | | | Better caching and indexing of broadcast messagesYorick Peterse2017-08-116-8/+80
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '36213-return-is_admin-in-users-api-when-current_user-is-admin' ↵Sean McGivern2017-08-113-9/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Include the `is_admin` field in the `GET /users/:id` API when current user is an admin Closes #36213 See merge request !13501
| * | | | | | Include the `is_admin` field in the `GET /users/:id` API when current user ↵Rémy Coutable2017-08-113-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is an admin Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'winh-git-revision-dropdown-style' into 'master'Annabel Dunstone Gray2017-08-112-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Git revision dropdown style consistent See merge request !13116
| * | | | | | | Make Git revision dropdown style consistentwinh-git-revision-dropdown-stylewinh2017-08-092-4/+6
| | | | | | | |
* | | | | | | | Merge branch '35435-pending-delete-project-error-in-admin-interface-fix' ↵Douwe Maan2017-08-114-1/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-114-1/+23
| | | | | | | | |
* | | | | | | | | Merge branch 'rc/32308-rspec-retry-hack' into 'master'Sean McGivern2017-08-1113-106/+706
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Detect and keep track of flaky specs See merge request !13021
| * | | | | | | | Document rspec-retry and rspec-flakyRémy Coutable2017-08-111-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Fix cop descriptionRémy Coutable2017-08-111-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Retrieve and sync flaky specs report from and to S3Rémy Coutable2017-08-113-88/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Use a new RspecFlakyListener to detect flaky specsRémy Coutable2017-08-118-12/+537
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'dm-session-delete-challenge' into 'master'Robert Speicher2017-08-111-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete correct key from `session` after authenticating using U2F Closes #36096 See merge request !13499
| * | | | | | | Delete correct key from `session` after authenticating using U2Fdm-session-delete-challengeDouwe Maan2017-08-111-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-1151-173/+2042
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a separate table for storing push events See merge request !12463
| * | | | | | | Use a specialized class for querying eventsYorick Peterse2017-08-1012-17/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1041-157/+1802
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-117-6/+98
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache Appearance instances in Redis Closes #36066 and #31698 See merge request !13433
| * | | | | | | | Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-107-6/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge branch '36174-show-error-message-for-500-in-tests' into 'master'Rémy Coutable2017-08-112-1/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show error message for API 500 error in tests Closes #36174 See merge request !13502