summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | Add username parameter to gravatar URLDouwe Maan2017-06-011-1/+1
| | | | | | | |
| * | | | | | | Merge branch '31644-make-cookie-sessions-unique' into 'master'Douwe Maan2017-06-011-1/+7
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update session cookie key name to be unique to instance in development Closes #31644 See merge request !11839
| | * | | | | | Update session cookie key name to be unique to instance in development31644-make-cookie-sessions-uniqueEric Eastwood2017-06-011-1/+7
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31644
| * | | | | | Merge branch 'dm-discussions-n-plus-1' into 'master'Sean McGivern2017-06-012-0/+15
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve N+1 query issue with discussions Closes #33013 See merge request !11775
| | * | | | | Do not try to preload Commits when using Note.includes(:noteable)Douwe Maan2017-05-312-0/+15
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-317-7/+144
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (116 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
| | * | | | | Merge branch 'gitaly-opt-out' into 'master'Rémy Coutable2017-05-302-2/+2
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Gitaly by default in GitLab 9.3 Closes gitaly#242 See merge request !11796
| | | * | | | Enable Gitaly by default in GitLab 9.3Jacob Vosmaer2017-05-302-2/+2
| | | | | | |
| | * | | | | Merge branch 'fix/gb/improve-active-record-test-extensions' into 'master'Rémy Coutable2017-05-301-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `ActiveRecord::Migrator` idempotent again in test environment Closes #33030 See merge request !11762
| | | * | | | Make `ActiveRecord::Migrator` idempotent again in test envfix/gb/improve-active-record-test-extensionsGrzegorz Bizon2017-05-291-1/+1
| | | | |/ / | | | |/| |
| | * | | | Merge branch '31849-pipeline-show-view-realtime' into 'master'Phil Hughes2017-05-301-3/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a mediator for pipeline details vue in order to mount several vue apps with the same data Closes #31849 See merge request !11732
| | | * | | | Creates a mediator for pipeline details vue in order to mount several vue ↵Filipa Lacerda2017-05-261-3/+3
| | | | |_|/ | | | |/| | | | | | | | | | | | | | apps with the same data
| | * | | | Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'Rémy Coutable2017-05-301-0/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 31616-add-uptime-of-gitlab-instance-in-admin-area Closes #31616 See merge request !11590
| | | * | | 31616-add-uptime-of-gitlab-instance-in-admin-areajboltz882017-05-291-0/+1
| | | | | |
| | * | | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-291-0/+132
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Rework project authorizations and nested groups for better performance See merge request !10885
| | | * | | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-171-0/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'fix-counter-cache-for-acts-as-taggable' into 'master'Stan Hu2017-05-261-0/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Counter Cache not being disabled for acts-on-taggable Closes #30582 See merge request !11727
| | | * | | | Fix Counter Cache not being disabled for acts-on-taggablefix-counter-cache-for-acts-as-taggableKamil Trzcinski2017-05-261-0/+4
| | | | | | |
| | * | | | | Merge branch 'locale-region-fix' into 'master'Douwe Maan2017-05-261-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed locale frontend not picking up regions Closes #32913 See merge request !11717
| | | * | | | | Fixed locale frontend not picking up regionslocale-region-fixPhil Hughes2017-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by a webpack config issue that would only look in folders that only had lower case letters. This has been changed to include any word character Closes #32913
| * | | | | | | Use another scope to add the - prefix, feedback:Lin Jen-Shin2017-05-311-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11407#note_30922591
| * | | | | | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decision was made around: https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641
| * | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2615-58/+105
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (307 commits) Address feedback Add small update for the i18n guide. update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin name all webpack chunks to improve long term cacheability add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin upgrade to latest webpack version Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ Provide default for calculating label text color (!11681) Add failing test for #32728 Bugfix: Always use the default language when generating emails. Remove unecessary commit pattern check Add regexp_for_value helper method Remove shared example and improve sub_group_issuables_spec.rb Remove 'should' from scenario in has_subgroup_title_spec.rb Cartfile git and binary methods cannot take a GitHub repo Fix terminals support for Kubernetes service Add review comments to compare_spec.rb Fix transient error clicking dropdown items in compare_spec.rb Use non-global jQuery reference within raven bundle ...
| | * | | | | | Merge branch '32737-audit-long-term-cacheability-of-webpack-assets' into ↵Tim Zallmann2017-05-261-2/+16
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Audit long-term cacheability of webpack assets" Closes #32737 See merge request !11622
| | | * | | | | name all webpack chunks to improve long term cacheabilityMike Greiling2017-05-251-1/+13
| | | | | | | |
| | | * | | | | add NameAllModulesPlugin to cover shortcomings of NamedModulesPluginMike Greiling2017-05-251-1/+3
| | | |/ / / /
| | * | | | | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'Douwe Maan2017-05-251-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-0/+1
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-257-45/+44
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor `DynamicPathValidator` and `GitLab::Regex` some more See merge request !11693
| | | * | | | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-247-45/+44
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5
| | * | | | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-254-3/+17
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Web Hooks calls logging Closes #17848 See merge request !11027
| | | * | | | | Implement web hooks loggingAlexander Randa2017-05-254-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * implemented logging of project and system web hooks * implemented UI for user area (project hooks) * implemented UI for admin area (system hooks) * implemented retry of logged webhook * NOT imeplemented log remover
| | * | | | | | user can reset his rss token on the account pageAlexis Reigel2017-05-241-0/+1
| | | | | | | |
| | * | | | | | add rss_token attribute to user modelAlexis Reigel2017-05-241-0/+1
| | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-244-6/+25
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ambiguous routing issues by teaching router about reserved words See merge request !11570
| | | * | | | | Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-237-44/+45
| | | | | | | |
| | | * | | | | Fix specsDouwe Maan2017-05-231-1/+1
| | | | | | | |
| | | * | | | | Fix ambiguous routing issues by teaching router about reserved wordsDouwe Maan2017-05-237-43/+61
| | | | |_|_|/ | | | |/| | |
| | * | | | | drop HashedModuleIdsPlugin in favor of NamedModulesPlugin in all environments32835-stop-using-webpack-hashedmoduleidsplugin-in-productionMike Greiling2017-05-231-4/+2
| | | |_|/ / | | |/| | |
| | * | | | Update gitlab.yml with default settingzj-ps-update-gitlab-ymlZ.J. van de Weg2017-05-221-1/+1
| | |/ / /
| | * | | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-191-1/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Load improvements related to MR widget See merge request !11518
| | | * | | Remove routeOswaldo Ferreira2017-05-191-1/+0
| | | |/ /
| | * | | Merge branch '31933-improve-rspec-profiling-enabling' into 'master'Stan Hu2017-05-191-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty Closes #31933 See merge request !11543
| | | * | | Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty31933-improve-rspec-profiling-enablingRémy Coutable2017-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | Merge branch 'zj-increase-accuracy-ps' into 'master'Kamil Trzciński2017-05-191-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Run the schedule worker once an hour by default See merge request !11476
| | | * | | Run the schedule worker once an hour by defaultzj-increase-accuracy-psZ.J. van de Weg2017-05-181-1/+1
| | | |/ / | | | | | | | | | | | | | | | [ci skip]
| | * | | Consolidate user avatar Vue logicBryce Johnson2017-05-181-2/+3
| | |/ /
| * | | Complete all legacy builds URL. Tests are addedLin Jen-Shin2017-05-191-22/+2
| | | |
| * | | Use a single route, reducing duplicationLin Jen-Shin2017-05-181-27/+16
| | | |
| * | | Disable rubocop hash check for blocksLin Jen-Shin2017-05-181-0/+6
| | | |