summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move the personal snippet uploads from `system` to `-/system`bvl-rollback-renamed-system-namespaceBob Van Landuyt2017-08-114-4/+184
| | | | | Update the markdown unconditionally since the move might have been done before, but the markdown not updated.
* Make sure uploads for personal snippets are correctly renderedBob Van Landuyt2017-08-118-22/+22
|
* Update migrations to move directly into the `-/system` folderBob Van Landuyt2017-08-1111-8/+146
|
* Don't update upload paths twiceBob Van Landuyt2017-08-112-110/+0
| | | | | | This will be done in 20170717150329_enqueue_migrate_system_uploads_to_new_folder.rb instead.
* Don't rename the system namespaceBob Van Landuyt2017-08-113-485/+4
|
* 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
| * | | | Show error message for API 500 error in tests, andLin Jen-Shin2017-08-112-1/+18
| | | | | | | | | | | | | | | | | | | | document have_gitlab_http_status
* | | | | Merge branch '35131-do-not-run-ee_compat_check-for-stableish-branches' into ↵Rémy Coutable2017-08-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Do not run the `ee_compat_check` job for stableish branches Closes #35131 See merge request !13497
| * | | | Do not run the `ee_compat_check` job for stableish branches35131-do-not-run-ee_compat_check-for-stableish-branchesRémy Coutable2017-08-111-1/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch ↵Yorick Peterse2017-08-112-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-112-0/+13
| |/ / / | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'rs-rspec-hook-argument-cop' into 'master'Rémy Coutable2017-08-1159-92/+85
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable the RSpec/HookArgument cop and auto-correct offenses See merge request !13484
| * | | | Remove documentation about rules that are now enforced by RuboCoprs-rspec-hook-argument-copRobert Speicher2017-08-101-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RuboCop is _living_ documentation! :sparkles: [ci skip]
| * | | | Enable the RSpec/HookArgument cop and auto-correct offensesRobert Speicher2017-08-1058-86/+85
| | | | |
* | | | | Merge branch 'fix-36308' into 'master'Rémy Coutable2017-08-111-5/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rb Closes #36308 See merge request !13488
| * | | | | Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rbMehdi Lahmam2017-08-111-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | It closes #36308
* | | | | | Merge branch 'bump-omniauth-ldap-gem-version-2-0-4' into 'master'Douwe Maan2017-08-113-3/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps omniauth-ldap gem version to 2.0.4 Closes #25637 See merge request !13465
| * | | | | | Bumps omniauth-ldap gem version to 2.0.4bump-omniauth-ldap-gem-version-2-0-4Tiago Botelho2017-08-113-3/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'zj-ref-path-monospace' into 'master'Douwe Maan2017-08-112-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Fix 404 on jobs details page See merge request !13459
| * | | | | Fix 404 on link pathzj-ref-path-monospaceZ.J. van de Weg2017-08-102-1/+5
| | | | | |
* | | | | | Merge branch 'master' into 'master'Rémy Coutable2017-08-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | French Translation - Missing "r" in "Fouché" word. It comes from "fourcher" verb. See merge request !13491
| * | | | | | Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.Olivier DOSSMANN2017-08-111-1/+1
| | | | | | |
* | | | | | | Merge branch 'gitlab-git-expose-raw-log' into 'master'Sean McGivern2017-08-111-16/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Expose the raw_log method See merge request !13434
| * | | | | | Expose the raw_log methodgitlab-git-expose-raw-logJacob Vosmaer2017-08-091-16/+17
| | | | | | |
* | | | | | | Merge branch '36270-collapsed-sidebar-scroll' into 'master'Phil Hughes2017-08-111-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove horizontal scroll on collapsed sidebar Closes #36270 See merge request !13458
| * | | | | | | Hide overflow-x on collapsed sidebar36270-collapsed-sidebar-scrollAnnabel Dunstone Gray2017-08-101-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'fix-typos' into 'master'36327-tooltipRémy Coutable2017-08-113-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix minor typos in views Closes #36317 See merge request !13487
| * | | | | | | | Fix minor typos in viewsMehdi Lahmam2017-08-113-4/+4
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #36317.
* | | | | | | | Merge branch 'docs-update-docs' into 'master'Achilleas Pipinellis2017-08-112-59/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Docs: update user docs index See merge request !13471
| * | | | | | | Docs: update user docs indexMarcia Ramos2017-08-112-59/+33
|/ / / / / / /
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJose Ivan Vargas2017-08-10170-696/+1246
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '36192-change-ha-docs-to-update-using-efs-as-nfs' into 'master'Stan Hu2017-08-101-0/+4
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Change HA docs to update using EFS as NFS" Closes #36192 See merge request !13400
| | * | | | | | Update nfs.md with information on AWS EFS and Burst Credit usage and how to ↵36192-change-ha-docs-to-update-using-efs-as-nfsJohn Woods2017-08-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increase Burst Credit limits and also limit the need for AWS to access EFS by using FS Cache.
| * | | | | | | Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_specRobert Speicher2017-08-101-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'jej/security-release-2017-08-10' into 'master'Stan Hu2017-08-106-1/+61
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file disclosure via hidden symlinks using the project import (9.3) See merge request !2164
| * | | | | | | | Merge branch 'filter-nginx-access-logs' into 'master'Robert Speicher2017-08-102-3/+71
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter sensitive query string parameters from NGINX access logs Closes #19203 See merge request !13453
| | * | | | | | | | Filter sensitive query string parameters from NGINX access logsNick Thomas2017-08-102-3/+71
| | |/ / / / / / /
| * | | | | | | | Merge branch '21949-add-type-to-changelog' into 'master'Robert Speicher2017-08-104-75/+215
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's start labeling our CHANGELOG entries Closes #21949 See merge request !11579
| | * | | | | | | | Let's start labeling our CHANGELOG entriesJacopo2017-07-224-75/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the type attribute to a CHANGELOG entry. When you create a new entry the software asks for the category of the change and sets the associated type in the file.
| * | | | | | | | | Merge branch 'rc/improve-projects-factory' into 'master'Robert Speicher2017-08-106-196/+130
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the Project factory to make `creator` defaults to `namespace.owner` See merge request !13412
| | * | | | | | | | | 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>