summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '30410-revert-9347-and-10079' into 'master'Douwe Maan2017-05-301-6/+0
|\ | | | | | | | | | | | | Resolve "Allow to disable username on checkout url" Closes #30410 and #30174 See merge request !11792
| * Don't allow to pass a user to ProjectWiki#http_url_to_repoRémy Coutable2017-05-301-6/+0
| | | | | | | | | | | | This partially reverts be25bbc4d2c7e3d5cf3da6f51cb7f7355295ef52. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Enable Gitaly by default in GitLab 9.3Jacob Vosmaer2017-05-302-2/+2
| |
* | Merge branch ↵Douwe Maan2017-05-301-1/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled' into 'master' 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Closes #19107 See merge request !11754
| * | 'New issue'/'New merge request' dropdowns should show only projects with ↵19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabledblackst0ne2017-05-301-1/+7
| | | | | | | | | | | | issues/merge requests feature enabled
* | | Merge branch ↵Grzegorz Bizon2017-05-301-2/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | '33032-invalid-you-directly-addressed-yourself-todo-when-using-unsubscribe' into 'master' Resolve "Invalid 'You directly addressed yourself' TODO when using `/unsubscribe`" Closes #33032 See merge request !11788
| * | Fix /unsubscribe slash command creating extra todos33032-invalid-you-directly-addressed-yourself-todo-when-using-unsubscribeSean McGivern2017-05-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The /unsubscribe slash command means that we check if the current user is subscribed to the issuable without having an explicit subscription. That means that we use the UserParser to find references to them in the notes. The UserParser (and all parsers inheriting from BaseParser) use RequestStore to cache ActiveRecord objects, so that we don't need to load the User object each time, if we're parsing references a bunch of times in the same request. However, it was always returning _all_ of the previously cached items, not just the ones matching the IDs passed. This would mean that we did two runs through with UserParser if you were mentioned in a comment, and then mentioned someone else in your comment while using /unsubscribe: 1. Because /unsubscribe was used, we see if you were mentioned in any comments. 2. Because you mentioned someone, we find them - but we would also get back your user, even if you didn't mention yourself. This would have the effect of creating a mention or directly addressed todo for yourself incorrectly. The fix is simple: only return values from the cache matching the IDs passed.
* | | Merge branch ↵Fatih Acet2017-05-301-0/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master' Resolve "Browser notifications for pipeline running in a MR is gone" Closes #32916 See merge request !11734
| * | Add rubocop:disable to gon_helper.rb32916-browser-notifications-for-pipeline-running-in-a-mr-is-goneLuke "Jared" Bennett2017-05-261-0/+2
| | |
| * | Restore notifications to MR widgetLuke "Jared" Bennett2017-05-261-0/+1
| | |
* | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-298-4/+344
|\ \ \ | | | | | | | | | | | | | | | | Rework project authorizations and nested groups for better performance See merge request !10885
| * | | Hide nested group UI/API support for MySQLYorick Peterse2017-05-176-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | This hides/disables some UI elements and API parameters related to nested groups when MySQL is used, since nested groups are not supported for MySQL.
| * | | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-174-0/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces the usage of Common Table Expressions (CTEs) to efficiently retrieve nested group hierarchies, without having to rely on the "routes" table (which is an _incredibly_ inefficient way of getting the data). This requires a patch to ActiveRecord (found in the added initializer) to work properly as ActiveRecord doesn't support WITH statements properly out of the box. Unfortunately MySQL provides no efficient way of getting nested groups. For example, the old routes setup could easily take 5-10 seconds depending on the amount of "routes" in a database. Providing vastly different logic for both MySQL and PostgreSQL will negatively impact the development process. Because of this the various nested groups related methods return empty relations when used in combination with MySQL. For project authorizations the logic is split up into two classes: * Gitlab::ProjectAuthorizations::WithNestedGroups * Gitlab::ProjectAuthorizations::WithoutNestedGroups Both classes get the fresh project authorizations (= as they should be in the "project_authorizations" table), including nested groups if PostgreSQL is used. The logic of these two classes is quite different apart from their public interface. This complicates development a bit, but unfortunately there is no way around this. This commit also introduces Gitlab::GroupHierarchy. This class can be used to get the ancestors and descendants of a base relation, or both by using a UNION. This in turn is used by methods such as: * Namespace#ancestors * Namespace#descendants * User#all_expanded_groups Again this class relies on CTEs and thus only works on PostgreSQL. The Namespace methods will return an empty relation when MySQL is used, while User#all_expanded_groups will return only the groups a user is a direct member of. Performance wise the impact is quite large. For example, on GitLab.com Namespace#descendants used to take around 580 ms to retrieve data for a particular user. Using CTEs we are able to reduce this down to roughly 1 millisecond, returning the exact same data. == On The Fly Refreshing Refreshing of authorizations on the fly (= when users.authorized_projects_populated was not set) is removed with this commit. This simplifies the code, and ensures any queries used for authorizations are not mutated because they are executed in a Rails scope (e.g. Project.visible_to_user). This commit includes a migration to schedule refreshing authorizations for all users, ensuring all of them have their authorizations in place. Said migration schedules users in batches of 5000, with 5 minutes between every batch to smear the load around a bit. == Spec Changes This commit also introduces some changes to various specs. For example, some specs for ProjectTeam assumed that creating a personal project would _not_ lead to the owner having access, which is incorrect. Because we also no longer refresh authorizations on the fly for new users some code had to be added to the "empty_project" factory. This chunk of code ensures that the owner's permissions are refreshed after creating the project, something that is normally done in Projects::CreateService.
* | | | Merge branch 'gitaly-init-default' into 'master'Douwe Maan2017-05-291-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Duplicate gitaly init variables in 'default' file Closes #31858 See merge request !11738
| * | | Duplicate gitaly init variables in 'default' fileJacob Vosmaer2017-05-261-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | This is needed because these variables depend (directly or indirectly) on the 'app_root' variable which can be changed in the default file. If app_root has a non-standard value, the value of e.g. gitaly_dir generated in the init script becomes invalid.
* | | Merge branch 'dm-dependency-value-regex' into 'master'Grzegorz Bizon2017-05-262-5/+5
|\ \ \ | | | | | | | | | | | | | | | | Don't allow spaces in dependency linker value regex See merge request !11721
| * | | Don't allow spaces in dependency linker value regexDouwe Maan2017-05-252-5/+5
| | | |
* | | | Merge branch ↵Grzegorz Bizon2017-05-261-8/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '31459-fix-transient-error-caused-by-small-timeout-also-adapt-tests-to-work-locally-correctly' into 'master' Fix transient CI errors by increasing command execution timeouts from 1s to 30s Closes #31459 See merge request !11420
| * | | | Move helpers to spec file, use const's instead of helper methodsPawel Chojnacki2017-05-251-8/+4
| | | | |
| * | | | Fix transient CI errors by increasing command execution timeouts from 1s to 30sPawel Chojnacki2017-05-171-5/+10
| | | | | | | | | | | | | | | | | | | | + actually make local tests correctly detect wether 'timeout' or 'gtimeout' is available
* | | | | Merge branch '31448-jira-urls' into 'master'Grzegorz Bizon2017-05-261-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API URL to JIRA settings Closes #31448 See merge request !11707
| * | | | | Add API URL to JIRA settings31448-jira-urlsJarka Kadlecova2017-05-261-1/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'diffcollection-no-restarts' into 'master'Douwe Maan2017-05-261-18/+21
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Fix buffering in DiffCollection See merge request !11659
| * | | | Use the iterator inside DiffCollection only onceJacob Vosmaer2017-05-241-18/+21
| | | | |
* | | | | Merge branch '31556-ci-coverage-paralel-rspec' into 'master'Kamil Trzciński2017-05-261-23/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the last coverage in trace stream Closes #31556 See merge request !11128
| * | | | | Resolve static analysys. Use until instead of negative whileShinya Maeda2017-05-251-2/+2
| | | | | |
| * | | | | Adopt ayufan scriptShinya Maeda2017-05-241-12/+13
| | | | | |
| * | | | | put force_encoding in def reverse_lineShinya Maeda2017-05-241-3/+3
| | | | | |
| * | | | | Append gurad clause. remove unless debris.emptyShinya Maeda2017-05-241-1/+3
| | | | | |
| * | | | | Avoid tap. Use unless&empty.Shinya Maeda2017-05-241-7/+5
| | | | | |
| * | | | | Improve calc_read_sizeShinya Maeda2017-05-241-6/+2
| | | | | |
| * | | | | Optimize reverse_lineShinya Maeda2017-05-241-12/+13
| | | | | |
| * | | | | much betterShinya Maeda2017-05-241-7/+1
| | | | | |
| * | | | | Refer reverse_line from read_last_linesShinya Maeda2017-05-241-22/+7
| | | | | |
| * | | | | Use force_encoding(regex.encoding)Shinya Maeda2017-05-241-2/+2
| | | | | |
| * | | | | Use force_encoding when regex contains UTF-8 charShinya Maeda2017-05-241-1/+1
| | | | | |
| * | | | | Use each_line. Avoid comparison of partial. Add UTF-8 spec.Shinya Maeda2017-05-241-5/+3
| | | | | |
| * | | | | Fix reverse_line from chunk basedShinya Maeda2017-05-241-2/+17
| | | | | |
| * | | | | Fix while trueShinya Maeda2017-05-241-13/+8
| | | | | |
| * | | | | Add reverse_lineShinya Maeda2017-05-241-1/+21
| | | | | |
* | | | | | Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-257-41/+76
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Clean up diff rendering See merge request !11390
| * | | | | Address feedbackDouwe Maan2017-05-251-1/+1
| | | | | |
| * | | | | Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-233-31/+57
| | | | | |
| * | | | | Clean up diff renderingDouwe Maan2017-05-231-0/+2
| | | | | |
| * | | | | Rename Diff::File {old,new}_ref to {old,new}_shaDouwe Maan2017-05-232-7/+7
| | | | | |
| * | | | | Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-233-8/+15
| | | | | |
* | | | | | Merge branch '32851-fix-postgres-9-1' into 'master'Douwe Maan2017-05-251-1/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "GitLab 9.0 to 9.2 is incompatible with PostgreSQL 9.1" See merge request !11709
| * | | | | | Only use DROP INDEX CONCURRENTLY on postgreql 9.2+Nick Thomas2017-05-251-1/+34
| | | | | | |
* | | | | | | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'Douwe Maan2017-05-252-7/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix: Always use the default language when generating emails. Closes #32748 See merge request !11662
| * | | | | | | Bugfix: Always use the default language when generating emails.32748-emails-are-being-sent-with-the-wrong-languageRuben Davila2017-05-252-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a race condition issue when the application was generating an email and was using a language that was previously being used in other request.
View Lorry Controller Status