summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ce-port-315-log-impersonation-actions-in-audit-log' into 'master'Ash McKenzie2019-07-231-0/+6
|\ | | | | | | | | CE Port: Log impersonation actions in audit log See merge request gitlab-org/gitlab-ce!31039
| * CE Port: Log impersonation actions in audit logce-port-315-log-impersonation-actions-in-audit-logmanojmj2019-07-231-0/+6
| | | | | | | | | | | | This change adds audit logs for user impersonation when an admin starts/stops impersonating another user.
* | Merge branch 'if-64257-active_session_lookup_key_cleanup' into 'master'Bob Van Landuyt2019-07-232-1/+31
|\ \ | | | | | | | | | | | | Rake task to cleanup expired ActiveSession lookup keys See merge request gitlab-org/gitlab-ce!30668
| * | Rake task to cleanup expired ActiveSession lookup keysif-64257-active_session_lookup_key_cleanupImre Farkas2019-07-222-1/+31
| | | | | | | | | | | | | | | | | | | | | In some cases ActiveSession.cleanup was not called after authentication, so for some user ActiveSession lookup keys grew without ever cleaning up. This Rake task manually iterates over the lookup keys and removes ones without existing ActiveSession.
* | | Merge branch 'gsemet/gitlab-ce-gsemet-master-patch-33258' into 'master'Sean McGivern2019-07-232-4/+40
|\ \ \ | | | | | | | | | | | | | | | | Multiple pipeline support for Build status See merge request gitlab-org/gitlab-ce!30828
| * | | Add specs for specifying pipeline behaviorMatija Čupić2019-07-232-4/+40
| | | | | | | | | | | | | | | | | | | | Adds specs for testing the new behavior of specifying a pipeline when POSTing a status.
* | | | Merge branch 'georgekoltsov/64377-add-better-log-msg-to-members-mapper' into ↵Ash McKenzie2019-07-231-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add better error message to MembersMapper#ensure_default_member! See merge request gitlab-org/gitlab-ce!30838
| * | | | Add MembersMapper#ensure_default_user! specGeorge Koltsov2019-07-171-0/+10
| |/ / /
* | | | Merge branch 'rm-src-branch' into 'master'Grzegorz Bizon2019-07-231-0/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Support remove source branch on merge w/ push options See merge request gitlab-org/gitlab-ce!30728
| * | | | Support rm src branch on merge w/ push optionChristian Couder2019-07-171-0/+76
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `remove_source_branch` set using git push options. To create a new merge request and set it to remove the source branch when it is merged: git push -u origin -o merge_request.create \ -o merge_request.remove_source_branch To update an existing merge request and set it to remove the source branch when it is merged: git push -u origin -o merge_request.remove_source_branch Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* | | | Bring backward compatibility for request profilesKamil Trzciński2019-07-234-10/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that we missed the backward compatibility support for profiles in the existing folder. This commit also fixes some specs to be idempotent and work in a temporary directory which not always seems to be the case. This commit also brings the profile_spec.rb which seems to be missing.
* | | | Merge branch 'group_with_cluster_factory' into 'master'Robert Speicher2019-07-222-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Adds cluster_for_group factory for convenience See merge request gitlab-org/gitlab-ce!30826
| * | | | Adds cluster_for_group factory for convienencegroup_with_cluster_factoryThong Kuah2019-07-192-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also means we don't have to resort to an update statement to set parent for child groups who also have clusters. This is much shorter than ``` create(:cluster, :provided_by_gcp, :group, groups: [group]) ```
* | | | | Add review remarksGosia Ksionek2019-07-221-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cr remarks Add cr remarks
* | | | | Merge branch 'resolve-remaining-import-export-differences' into 'master'Robert Speicher2019-07-223-2/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve remaining import export differences See merge request gitlab-org/gitlab-ce!31012
| * | | | | Backport import/export spec changes from EEresolve-remaining-import-export-differencesYorick Peterse2019-07-222-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | This backports remaining import/export spec changes from EE to CE.
| * | | | | Backport project.json fixture from EEYorick Peterse2019-07-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports all changes made to an import/export fixture file from EE to CE.
* | | | | | Merge branch 'remove-duplicate-all-models-entry' into 'master'Robert Speicher2019-07-221-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate entry from all_models.yml See merge request gitlab-org/gitlab-ce!31010
| * | | | | | Remove duplicate entry from all_models.ymlremove-duplicate-all-models-entryYorick Peterse2019-07-221-1/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This line is already present further down in the YAML file. In EE the line is already removed.
* | | | | | Validate certificate chain only if it's changedVladimir Shushlin2019-07-222-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This validation prevents the domain from being saved from the UI e.g. when user tries to enable Let's Encrypt integration
* | | | | | Merge branch 'maintainers-can-create-subgroup' into 'master'Sean McGivern2019-07-2210-26/+249
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a group setting to allow Maintainers to create sub-groups See merge request gitlab-org/gitlab-ce!29718
| * | | | | | Resolve some issues in MRFabio Papa2019-07-192-3/+2
| | | | | | |
| * | | | | | Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-191-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | * \ \ \ \ \ Merge branch 'master' into 'maintainers-can-create-subgroup'Fabio Papa2019-07-12177-932/+4837
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # doc/user/permissions.md
| | * \ \ \ \ \ \ Merge branch 'maintainers-can-create-subgroup' of ↵Fabio Papa2019-07-052-6/+4
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| | | * | | | | | | Fixed a failing testFabio Papa2019-07-051-10/+6
| | | | | | | | | |
| | | * | | | | | | Apply recomended changes from merge coachFabio Papa2019-07-022-8/+10
| | | | | | | | | |
| | | * | | | | | | Fix some code style issuesFabio Papa2019-07-022-11/+14
| | | | | | | | | |
| | | * | | | | | | Modify API spec to expect a maintainer to be able to create subgroupFabio Papa2019-07-021-4/+0
| | | | | | | | | |
| | | * | | | | | | Add failing unit test specifying a maintainer creating a subgroupFabio Papa2019-07-022-2/+19
| | | | | | | | | |
| | | * | | | | | | Apply changes recomended by merge request coachFabio Papa2019-07-024-15/+13
| | | | | | | | | |
| | | * | | | | | | Add descriptions to examplesFabio Papa2019-07-021-2/+2
| | | | | | | | | |
| | | * | | | | | | Fix group creat_service_spec to contain maintainer contextFabio Papa2019-07-021-2/+2
| | | | | | | | | |
| | | * | | | | | | Clean up the show_spec examples previously addedFabio Papa2019-07-021-18/+18
| | | | | | | | | |
| | | * | | | | | | Make subgroup_creation_level default to maintainer at SQL levelFabio Papa2019-07-027-24/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Migration updates existing groups to "owner", then sets default to "maintainer" so that new groups will default to that - Update spec examples
| | | * | | | | | | Make maintainers the default setting for creating subgroupsFabio Papa2019-07-021-0/+8
| | | | | | | | | |
| | | * | | | | | | Remove an example that is no longer necessaryFabio Papa2019-07-021-9/+0
| | | | | | | | | |
| | | * | | | | | | Style rules; Revert some examplesFabio Papa2019-07-027-20/+47
| | | | | | | | | |
| | | * | | | | | | Add feature examples specing maintainers creating subgroupsFabio Papa2019-07-021-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both with subgroup_creation_level set to owners and to maintainers. Also fixed the naming of some other examples in the same spec as they were contradicting what they were actually performing in the test. These examples were probably copy/pasted, and not renamed.
| | | * | | | | | | Add examples specing the setting to choose who can create subgroupsFabio Papa2019-07-026-10/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This setting is at the group level only. The default is specified to be maintainers and owners. **Specs only**, all failing.
| | | * | | | | | | Modify API spec to expect a maintainer to be able to create subgroupFabio Papa2019-07-022-6/+2
| | | | | | | | | |
| | | * | | | | | | Add failing unit test specifying a maintainer creating a subgroupFabio Papa2019-07-022-2/+19
| | | | | | | | | |
| | | * | | | | | | Add failing feature spec detailing a maintainer creating a subgroupFabio Papa2019-07-021-13/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change the two existing feature examples that create a subgroup to elucidate that the owner is creating the subgroup - Nest two more specs inside the 'subgroup support' context detailing what happens when a maintainer attempts to add a subgroup (one with subgroup support, and one without)
| | * | | | | | | | Apply recomended changes from merge coachFabio Papa2019-07-051-2/+4
| | | | | | | | | |
| | * | | | | | | | Fix group creat_service_spec to contain maintainer contextFabio Papa2019-07-051-2/+2
| | | | | | | | | |
| | * | | | | | | | Clean up the show_spec examples previously addedFabio Papa2019-07-051-4/+2
| | | | | | | | | |
| | * | | | | | | | Make subgroup_creation_level default to maintainer at SQL levelFabio Papa2019-07-054-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Migration updates existing groups to "owner", then sets default to "maintainer" so that new groups will default to that - Update spec examples
| | * | | | | | | | Style rules; Revert some examplesFabio Papa2019-07-054-14/+9
| | | | | | | | | |
| | * | | | | | | | Add examples specing the setting to choose who can create subgroupsFabio Papa2019-07-053-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This setting is at the group level only. The default is specified to be maintainers and owners. **Specs only**, all failing.
| | * | | | | | | | Modify API spec to expect a maintainer to be able to create subgroupFabio Papa2019-07-051-4/+0
| | | | | | | | | |
View Lorry Controller Status