Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mc/feature/find-all-artifacts-for-sha' into 'master' | Robert Speicher | 2019-07-26 | 1 | -0/+63 |
|\ | | | | | | | | | | | | | Find build by sha from ref Closes #64534 and #45697 See merge request gitlab-org/gitlab-ce!30843 | ||||
| * | Extract common spec elements to shared_examplesmc/feature/find-all-artifacts-for-sha | Matija Čupić | 2019-07-26 | 1 | -0/+63 |
| | | |||||
* | | Merge branch '63568-access-email-notifications-custom-email' into 'master' | Lin Jen-Shin | 2019-07-26 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Respect alt email when sending group access notifications See merge request gitlab-org/gitlab-ce!31089 | ||||
| * | | Respect alt email when sending group access notifications63568-access-email-notifications-custom-email | Mario de la Ossa | 2019-07-25 | 1 | -1/+1 |
| |/ | | | | | | | | | When sending access granted/rejected emails we should also respect custom emails set for groups/sub-groups | ||||
* | | Feature test for gfm embedding metrics | Tristan Read | 2019-07-26 | 1 | -0/+8 |
| | | |||||
* | | Merge branch 'frozen_string_spec_support' into 'master' | Douwe Maan | 2019-07-25 | 247 | -4/+499 |
|\ \ | | | | | | | | | | | | | Add frozen_string_literal to spec/support See merge request gitlab-org/gitlab-ce!31132 | ||||
| * | | Fix frozen string error | Thong Kuah | 2019-07-25 | 1 | -4/+5 |
| | | | |||||
| * | | Add frozen_string_literal to spec/support | Thong Kuah | 2019-07-25 | 247 | -0/+494 |
| | | | | | | | | | | | | | | | Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758 | ||||
* | | | Merge branch 'refactor-redis-usage-counter-specs' into 'master' | Nick Thomas | 2019-07-25 | 1 | -0/+57 |
|\ \ \ | | | | | | | | | | | | | | | | | Refactor usage data counters specs See merge request gitlab-org/gitlab-ce!31013 | ||||
| * | | | Refactor usage data counters specsrefactor-redis-usage-counter-specs | Alex Kalderimis | 2019-07-22 | 1 | -0/+57 |
| | | | | | | | | | | | | | | | | This makes these tests available for other implementations | ||||
* | | | | Merge branch 'make-relative-positioning-module-reusable' into 'master' | Bob Van Landuyt | 2019-07-25 | 1 | -0/+253 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Make RelativePositioning reusable See merge request gitlab-org/gitlab-ce!30993 | ||||
| * | | | Make RelativePositioning reusablemake-relative-positioning-module-reusable | Adam Hegyi | 2019-07-24 | 1 | -0/+253 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RelativePositioning module was heavily dependent on the Issue model. This changes makes it easier to reuse the functionality provided by RelativePositioning in other models. Needed by: https://gitlab.com/gitlab-org/gitlab-ee/issues/12196 | ||||
* | | | | [ADD] outbound requests whitelist | Reuben Pereira | 2019-07-24 | 1 | -43/+60 |
|/ / / | | | | | | | | | | Signed-off-by: Istvan szalai <istvan.szalai@savoirfairelinux.com> | ||||
* | | | Prefer `flat_map` over `map` + `flatten` in specs | Peter Leitzen | 2019-07-24 | 1 | -1/+1 |
| |/ |/| | | | | | | | Although `flat_map` is equivalent to `map` + `flatten(1)` (note the level 1) we can apply this same refactoring to all cases. | ||||
* | | Merge branch 'safe-archiving-for-traces' into 'master' | Kamil Trzciński | 2019-07-23 | 1 | -0/+52 |
|\ \ | | | | | | | | | | | | | Extra logging for new live trace architecture See merge request gitlab-org/gitlab-ce!30892 | ||||
| * | | Validate the existence of archived traces before removing live tracesafe-archiving-for-traces | Shinya Maeda | 2019-07-23 | 1 | -0/+52 |
| |/ | | | | | | | | | Often live traces are removed even though the archived trace doesn't exist. This commit checkes the existence strictly. | ||||
* | | Make pipeline emails respect group email setting63485-fix-pipeline-emails-to-use-group-setting | Heinrich Lee Yu | 2019-07-23 | 1 | -30/+5 |
|/ | | | | | When a user's notification email is set for a group, we should use that for pipeline emails | ||||
* | Merge branch 'maintainers-can-create-subgroup' into 'master' | Sean McGivern | 2019-07-22 | 1 | -1/+1 |
|\ | | | | | | | | | Add a group setting to allow Maintainers to create sub-groups See merge request gitlab-org/gitlab-ce!29718 | ||||
| * | Resolve some issues in MR | Fabio Papa | 2019-07-19 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'maintainers-can-create-subgroup' of ↵ | Fabio Papa | 2019-07-19 | 1 | -2/+2 |
| |\ | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup | ||||
| | * | Merge branch 'master' into 'maintainers-can-create-subgroup' | Fabio Papa | 2019-07-12 | 15 | -37/+264 |
| | |\ | | | | | | | | | | | | | # Conflicts: # doc/user/permissions.md | ||||
| | * \ | Merge branch 'maintainers-can-create-subgroup' of ↵ | Fabio Papa | 2019-07-05 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | | | | | | | | https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup | ||||
| | | * | | Fixed a failing test | Fabio Papa | 2019-07-05 | 1 | -10/+6 |
| | | | | | |||||
| | | * | | Modify API spec to expect a maintainer to be able to create subgroup | Fabio Papa | 2019-07-02 | 1 | -4/+0 |
| | | | | | |||||
| | | * | | Add failing unit test specifying a maintainer creating a subgroup | Fabio Papa | 2019-07-02 | 1 | -2/+10 |
| | | | | | |||||
| | | * | | Make subgroup_creation_level default to maintainer at SQL level | Fabio Papa | 2019-07-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Migration updates existing groups to "owner", then sets default to "maintainer" so that new groups will default to that - Update spec examples | ||||
| | | * | | Add examples specing the setting to choose who can create subgroups | Fabio Papa | 2019-07-02 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 subgroup | Fabio Papa | 2019-07-02 | 1 | -4/+0 |
| | | | | | |||||
| | | * | | Add failing unit test specifying a maintainer creating a subgroup | Fabio Papa | 2019-07-02 | 1 | -2/+10 |
| | | | | | |||||
| | * | | | Add examples specing the setting to choose who can create subgroups | Fabio Papa | 2019-07-05 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 subgroup | Fabio Papa | 2019-07-05 | 1 | -4/+0 |
| | | | | | |||||
| | * | | | Add failing unit test specifying a maintainer creating a subgroup | Fabio Papa | 2019-07-05 | 1 | -2/+10 |
| | | | | | |||||
| | * | | | Add examples specing the setting to choose who can create subgroups | Fabio Papa | 2019-07-05 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 subgroup | Fabio Papa | 2019-07-05 | 1 | -4/+0 |
| | | | | | |||||
| | * | | | Add failing unit test specifying a maintainer creating a subgroup | Fabio Papa | 2019-07-05 | 1 | -2/+10 |
| | | | | | |||||
| | * | | | Make subgroup_creation_level default to maintainer at SQL level | Fabio Papa | 2019-07-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Migration updates existing groups to "owner", then sets default to "maintainer" so that new groups will default to that - Update spec examples | ||||
| | * | | | Add examples specing the setting to choose who can create subgroups | Fabio Papa | 2019-07-05 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 subgroup | Fabio Papa | 2019-07-05 | 1 | -4/+0 |
| | | | | | |||||
| | * | | | Add failing unit test specifying a maintainer creating a subgroup | Fabio Papa | 2019-07-05 | 1 | -2/+10 |
| | | | | | |||||
| * | | | | Add examples specing the setting to choose who can create subgroups | Fabio Papa | 2019-07-19 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 subgroup | Fabio Papa | 2019-07-19 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Add failing unit test specifying a maintainer creating a subgroup | Fabio Papa | 2019-07-19 | 1 | -2/+10 |
| | | | | | |||||
| * | | | | Add examples specing the setting to choose who can create subgroups | Fabio Papa | 2019-07-19 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 subgroup | Fabio Papa | 2019-07-19 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Add failing unit test specifying a maintainer creating a subgroup | Fabio Papa | 2019-07-19 | 1 | -2/+10 |
| | | | | | |||||
| * | | | | Add examples specing the setting to choose who can create subgroups | Fabio Papa | 2019-07-19 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 subgroup | Fabio Papa | 2019-07-19 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Add failing unit test specifying a maintainer creating a subgroup | Fabio Papa | 2019-07-19 | 1 | -2/+10 |
| | | | | | |||||
| * | | | | Add examples specing the setting to choose who can create subgroups | Fabio Papa | 2019-07-19 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 subgroup | Fabio Papa | 2019-07-19 | 1 | -4/+0 |
| | | | | |