Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use `:empty_project` where possible throughout spec/librs-empty_project-lib | Robert Speicher | 2017-01-25 | 65 | -103/+114 |
| | |||||
* | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' | Robert Speicher | 2017-01-24 | 1 | -20/+48 |
|\ | | | | | | | | | Dont persist application settings in test env See merge request !8715 | ||||
| * | Revert "Merge branch 'revert-9cac0317' into 'master' " | Grzegorz Bizon | 2017-01-23 | 1 | -20/+48 |
| | | | | | | | | | | This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e. | ||||
* | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into ↵ | Sean McGivern | 2017-01-24 | 1 | -0/+115 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allows to search within project by commit's hash #24833 Closes #24833 See merge request !8028 | ||||
| * | | Allows to search within project by commit's hash | YarNayar | 2017-01-24 | 1 | -0/+115 |
| | | | | | | | | | | | | Was proposed in #24833 | ||||
* | | | Merge branch ↵ | Douwe Maan | 2017-01-23 | 5 | -3/+106 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22619-add-an-email-address-to-unsubscribe-list-header-in-email' into 'master' Handle unsubscribe notification via email Closes #22619 See merge request !6597 | ||||
| * | | | Handles unsubscribe from notifications via email | Pawel Chojnacki | 2017-01-13 | 5 | -3/+106 |
| | | | | | | | | | | | | | | | | | | | | - allows unsubscription processing of email in format "reply+%{key}+unsubscribe@acme.com" (example) - if config.address includes %{key} and replies are enabled every unsubscriable message will include mailto: link in its List-Unsubscribe header | ||||
* | | | | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' | Douwe Maan | 2017-01-23 | 1 | -1/+8 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Allow creating protected branches when user can merge to such branch Closes #22638 See merge request !8458 | ||||
| * | | | Allow creating protected branch when it doesn't exist | Pawel Chojnacki | 2017-01-13 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | if user has either push or merge permissions + Change log entry for fix to creating a branch matching a wildcard fails | ||||
* | | | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' | Kamil Trzciński | 2017-01-23 | 7 | -110/+471 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a warning icon for a stage with allowed to fail builds Closes #21948 See merge request !8503 | ||||
| * | | | | Extend pipeline detailed status factory specs | Grzegorz Bizon | 2017-01-12 | 1 | -17/+28 |
| | | | | | |||||
| * | | | | Fix a Rubocop offense in detailed status factory | Grzegorz Bizon | 2017-01-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use detailed status for failed but allowed builds | Grzegorz Bizon | 2017-01-12 | 1 | -12/+113 |
| | | | | | |||||
| * | | | | Expose methods that match statuses in status factories | Grzegorz Bizon | 2017-01-12 | 1 | -17/+45 |
| | | | | | |||||
| * | | | | Make it possible to combine extended CI/CD statuses | Grzegorz Bizon | 2017-01-12 | 1 | -7/+90 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also makes it possible to configure exclusive groups. There can be only one detailed status matched within an exclusive group, which is important from the performance perspective. | ||||
| * | | | | Add extended status for build failed but allowed to | Grzegorz Bizon | 2017-01-11 | 1 | -0/+110 |
| | | | | | |||||
| * | | | | Add specs for two new methods defined in stage class | Grzegorz Bizon | 2017-01-11 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Add concrete success warning status to stage factory | Grzegorz Bizon | 2017-01-11 | 4 | -71/+100 |
| | | | | | |||||
| * | | | | Extract abstract success with warnings CI/CD status | Grzegorz Bizon | 2017-01-11 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into ↵ | Grzegorz Bizon | 2017-01-21 | 1 | -48/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !8573 | ||||
* | | | | | Merge branch 'fix/import-users' into 'master' | Rémy Coutable | 2017-01-20 | 2 | -9/+83 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import no longer mapping users as admin Closes #25346 See merge request !8625 | ||||
| * | | | | | fix member mapper specfix/import-users | James Lopez | 2017-01-20 | 1 | -24/+1 |
| | | | | | | |||||
| * | | | | | fix and refactor note user mapping | James Lopez | 2017-01-18 | 2 | -9/+38 |
| | | | | | | |||||
| * | | | | | added spec replicating the problem | James Lopez | 2017-01-18 | 2 | -2/+59 |
| | | | | | | |||||
| * | | | | | do not map usersat all unless admin | James Lopez | 2017-01-18 | 1 | -1/+12 |
| | | | | | | |||||
* | | | | | | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' | Robert Speicher | 2017-01-20 | 1 | -20/+48 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | Don't persist application settings in test env See merge request !8573 | ||||
| * | | | | | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-env | Rémy Coutable | 2017-01-15 | 1 | -20/+48 |
| |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | Merge branch 'feature/gitaly-feature-flag' into 'master' | Robert Speicher | 2017-01-19 | 1 | -0/+23 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly feature flag See merge request !8440 | ||||
| * | | | | | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flag | Ahmad Sherif | 2017-01-18 | 1 | -0/+23 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch '23563-document-presenters' into 'master' | Dmitriy Zaporozhets | 2017-01-19 | 4 | -0/+147 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document presenters Closes #23563 See merge request !8480 | ||||
| * | | | | | More improvements to presenters23563-document-presenters | Rémy Coutable | 2017-01-18 | 4 | -50/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | Improve presenter factory | Rémy Coutable | 2017-01-18 | 2 | -48/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | Improve presenter architecture | Rémy Coutable | 2017-01-18 | 4 | -29/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | Document presenters | Rémy Coutable | 2017-01-18 | 2 | -0/+77 |
| | |/ / / | |/| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | Merge branch 'fix/external-status-badge-links' into 'master' | Kamil Trzciński | 2017-01-19 | 2 | -0/+77 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link external commit status badges to target URLs Closes #25662 See merge request !8611 | ||||
| * | | | | | Add detailed statuses for external commit statuses | Grzegorz Bizon | 2017-01-17 | 2 | -0/+77 |
| |/ / / / | |||||
* | | | | | Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' | Douwe Maan | 2017-01-18 | 24 | -137/+286 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Refactor cycle analytics stages (1st iteration) See merge request !7647 | ||||
| * | | | | | refactored a bunch of stuff based on feedback | James Lopez | 2017-01-17 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | fix specs | James Lopez | 2017-01-17 | 3 | -20/+5 |
| | | | | | | |||||
| * | | | | | refactored metrics fetcher - merged into stage and events | James Lopez | 2017-01-17 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | fix specs, refactor missing bits from events stuff | James Lopez | 2017-01-17 | 9 | -33/+17 |
| | | | | | | |||||
| * | | | | | big refactor based on MR feedback | James Lopez | 2017-01-17 | 9 | -10/+11 |
| | | | | | | |||||
| * | | | | | fix spec failures after merge | James Lopez | 2017-01-17 | 3 | -5/+5 |
| | | | | | | |||||
| * | | | | | few fixes after merge | James Lopez | 2017-01-17 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | refactor cycle analytics - updated based on MR feedback | James Lopez | 2017-01-17 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fix other spec failures | James Lopez | 2017-01-17 | 1 | -0/+59 |
| | | | | | | |||||
| * | | | | | Fix other spec failures | James Lopez | 2017-01-17 | 9 | -63/+96 |
| | | | | | | |||||
| * | | | | | fixed stage entity and added missing stage specs | James Lopez | 2017-01-17 | 8 | -0/+86 |
| |/ / / / | |||||
* | | | | | Backport backend work for time tracking. | Ruben Davila | 2017-01-15 | 2 | -0/+15 |
|/ / / / | |||||
* | | | | Merge branch ↵ | Douwe Maan | 2017-01-14 | 1 | -3/+0 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-exist' into 'master' Resolve "`Gitlab::Checks::ChangeAccess` looks for user permissions that don't exist" Closes #25018 See merge request !8551 |