summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Support hard deletion in Admin::UsersController#destroyNick Thomas2017-06-051-2/+13
|
* Refactor the DeleteUserWorkerNick Thomas2017-06-051-1/+1
|
* Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-051-11/+34
|\ | | | | | | | | | | | | Initial implementation for real time job view Closes #31397 See merge request !11651
| * Fix test failuresKamil Trzcinski2017-06-031-2/+2
| |
| * Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-023-64/+55
| |\
| * | Add user to BuildDetailsEntityZ.J. van de Weg2017-06-021-1/+2
| | | | | | | | | | | | Also add minor changed needed to pass review
| * | Incorporate reviewZ.J. van de Weg2017-05-311-1/+1
| | |
| * | Initial implementation for real time job viewZ.J. van de Weg2017-05-311-11/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added the needed keys and paths to a new entity, BuildDetailsEntity. Not renaming BuildEntity to BuildBasicEntity on explicit request. Most code now has test coverage, but not all. This will be added on later commits on this branch. Resolves gitlab-org/gitlab-ce#31397
* | | Merge branch 'mabes/gitlab-ce-bypass-auto-login' into 'master'Douwe Maan2017-06-021-0/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow manual bypass of auto_sign_in_with_provider Closes #3786 See merge request !11884
| * | | Allow manual bypass of auto_sign_in_with_providermabes/gitlab-ce-bypass-auto-loginMaxime Besson2017-06-021-0/+31
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This commit lets a user bypass the automatic signin on the login form, in order to login with a technical (admin, etc) account Closes #3786 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '33139-lint-our-factories' into 'master'Grzegorz Bizon2017-06-021-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Lint our factories creation in addition to their build Closes #33139 See merge request !11823
| * | Lint our factories creation in addition to their build33139-lint-our-factoriesRémy Coutable2017-06-021-1/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Skip loading application settings from the database when migrations are pendingNick Thomas2017-06-021-1/+1
| | | | | | | | | | | | | | | | | | Various Rails initializers (metrics, sentry, etc) are run before migrations, which can lead to a mismatch between app/models/application_settings.rb and schema.
* | | Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-021-63/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599
| * | | Address MR commentsJarka Kadlecova2017-06-011-3/+0
| | | |
| * | | fix failing specsJarka Kadlecova2017-06-011-2/+2
| | | |
| * | | simplify test&save actions when setting a service integrationJarka Kadlecova2017-06-011-63/+52
| | |/ | |/|
* | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-019-60/+87
|\ \ \ | |/ /
| * | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-313-33/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename BuildsController to JobsController Closes #30699 See merge request !11407
| | * \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-311-1/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (63 commits) Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions Check only a merge ability for protected actions Add tag_list param to project api Allow PostReceivePack to be enabled with Gitaly Remove some deprecated methods Add :owned param to ProjectFinder ...
| | * \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-313-7/+24
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| | * | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | 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-2614-375/+844
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| | * | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-173-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename other URL generators admin_builds_path -> admin_jobs_path Fix tests and more renaming Fix more tests Also change build_id to job_id in the controller
| * | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-311-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue inline editing Closes #24873 See merge request !11322
| | * | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-305-25/+48
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | fixed move issue specsPhil Hughes2017-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Fix builds controller specs related to protected actionsGrzegorz Bizon2017-05-311-1/+5
| | |/ / / | |/| | |
| * | | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-293-7/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rework project authorizations and nested groups for better performance See merge request !10885
| | * | | | Hide nested group UI/API support for MySQLYorick Peterse2017-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-172-6/+9
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Add per page to user autocomplete32977-user-autocomplete-per_page-does-not-workClement Ho2017-05-261-0/+14
| | |_|/ | |/| |
| * | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-252-18/+24
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Refactor `DynamicPathValidator` and `GitLab::Regex` some more See merge request !11693
| | * | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-242-18/+24
| | | | | | | | | | | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5
* | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-256-51/+108
|\ \ \ \ | |/ / /
| * | | use full caps RSS instead of rssAlexis Reigel2017-05-241-3/+3
| | | |
| * | | atom links with rss token instead of private tokenAlexis Reigel2017-05-241-0/+36
| |/ /
| * | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-241-1/+1
| |\ \ | | | | | | | | | | | | | | | | 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-232-24/+18
| | | |
| | * | Fix specsDouwe Maan2017-05-232-19/+25
| | | |
| * | | Merge branch 'issue_32225' into 'master'Robert Speicher2017-05-231-4/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add transient head_pipeline_of to pipeline factories See merge request !11566
| | * | | Add transient head_pipeline_of to pipeline factoriesissue_32225Felipe Artur2017-05-221-4/+3
| | | | |
| * | | | Merge branch 'add-unicode-trace-feature-test' into 'master'Kamil Trzciński2017-05-231-42/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add feature test with unicode trace See merge request !10736
| | * | | | Add feature test with unicode traceadd-unicode-trace-feature-testShinya Maeda2017-05-231-42/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 43e5bba774e9e383dd55c665e82f6fcfc4ebfc4f Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com> Date: Mon Apr 17 17:28:44 2017 +0900 Add fix commit 09610eebdf22ad048812bb86022504b2ad917e19 Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com> Date: Mon Apr 17 17:03:49 2017 +0900 Add trace test
| * | | | | Merge branch 'zj-sort-env-folders' into 'master'Kamil Trzciński2017-05-231-7/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort environments folders when opening them Closes #30814 See merge request !11436
| | * | | | Improve test wordingZ.J. van de Weg2017-05-231-7/+7
| | | | | |
| | * | | | Make sorting difference clearerZeger-Jan van de Weg2017-05-191-4/+4
| | | | | |
| | * | | | Sort environments folders when opening themZ.J. van de Weg2017-05-171-0/+5
| | | |_|/ | | |/| | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#30814
| * | | | Merge branch 'prevent-project-transfer' into 'master'Douwe Maan2017-05-231-0/+44
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Prevent project transfer if a new group is not selected Closes #25455 See merge request !11214
| | * | | minor adjustments to the specsJose Ivan Vargas2017-05-221-10/+9
| | | | |