summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Grapify last endpoint of the branches APIgrapify-branch-apiRobert Schilling2017-01-241-6/+1
|
* Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-243-34/+16
|\ | | | | | | | | Dont persist application settings in test env See merge request !8715
| * Rescue from ActiveRecord::UnknownAttributeError and fallback to fake settingsdont-persist-application-settings-in-test-env-bisRémy Coutable2017-01-232-5/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-232-32/+16
| | | | | | | | | | This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e.
* | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into ↵Sean McGivern2017-01-242-1/+31
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allows to search within project by commit's hash #24833 Closes #24833 See merge request !8028
| * | Search feature: redirects to commit page if query is commit sha and only ↵YarNayar2017-01-242-1/+13
| | | | | | | | | | | | | | | | | | commit found See !8028 and #24833
| * | Allows to search within project by commit's hashYarNayar2017-01-241-1/+19
| | | | | | | | | | | | Was proposed in #24833
* | | Merge branch 'zj-mattermost-api-update' into 'master' Grzegorz Bizon2017-01-243-8/+18
|\ \ \ | | | | | | | | | | | | | | | | Small update to the Mattermost API See merge request !8712
| * | | Small update to the Mattermost APIzj-mattermost-api-updateZ.J. van de Weg2017-01-243-8/+18
| | | | | | | | | | | | | | | | | | | | These changes make it possible to wrap multiple API requests in one session.
* | | | Merge branch 'grapify-deploy-keys' into 'master' Rémy Coutable2017-01-241-9/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Grapify all endpoints of the deploy keys API See merge request !8721
| * | | Grapify all endpoints of the deploy keys APIgrapify-deploy-keysRobert Schilling2017-01-231-9/+8
| | |/ | |/|
* | | Merge branch 'rs-pick-security-fixes' into 'master' Robert Speicher2017-01-237-37/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pick security fixes from 8.16.1 et al into master Closes #26813, #26249, #26259, #26243, #26242 See merge request !8724
| * | | Merge branch 'fix-guest-access-posting-to-notes' into 'security' Robert Speicher2017-01-231-10/+16
| | | | | | | | | | | | | | | | | | | | Prevent users from creating notes on resources they can't access See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2054
| * | | Merge branch 'fix-api-mr-permissions' into 'security'Robert Speicher2017-01-235-24/+21
| | | | | | | | | | | | | | | | | | | | | | | | Ensure that only privileged users can access merge requests in the API See merge request !2053
| * | | Merge branch 'fix-users-deleting-public-deployment-keys' into 'security' Robert Speicher2017-01-231-3/+7
| | | | | | | | | | | | | | | | | | | | Fix users being able to delete instance public deployment keys See merge request !2049
* | | | Merge branch ↵Douwe Maan2017-01-237-46/+103
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 emailPawel Chojnacki2017-01-137-46/+103
| | | | | | | | | | | | | | | | | | | | | | | | | - 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 Maan2017-01-231-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 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 existPawel Chojnacki2017-01-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if user has either push or merge permissions + Change log entry for fix to creating a branch matching a wildcard fails
* | | | | Merge branch '22974-trigger-service-events-through-api' into 'master' Douwe Maan2017-01-231-3/+45
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | adds events to services api deserialization Closes #22974 See merge request !8324
| * | | | adds test suite22974-trigger-service-events-through-apiTiago Botelho2017-01-221-3/+2
| | | | |
| * | | | adds events to services api deserializationTiago Botelho2017-01-221-3/+46
| | | | |
* | | | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' Kamil Trzciński2017-01-237-53/+94
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a warning icon for a stage with allowed to fail builds Closes #21948 See merge request !8503
| * | | | | Add a default status const to common status concernGrzegorz Bizon2017-01-181-1/+1
| | | | | |
| * | | | | Extract compound statuses method in status factoryGrzegorz Bizon2017-01-181-3/+7
| | | | | |
| * | | | | Use detailed status for failed but allowed buildsGrzegorz Bizon2017-01-121-2/+5
| | | | | |
| * | | | | Expose methods that match statuses in status factoriesGrzegorz Bizon2017-01-121-15/+10
| | | | | |
| * | | | | Make it possible to combine extended CI/CD statusesGrzegorz Bizon2017-01-121-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 toGrzegorz Bizon2017-01-111-0/+27
| | | | | |
| * | | | | Add concrete success warning status to stage factoryGrzegorz Bizon2017-01-114-18/+7
| | | | | |
| * | | | | Extract abstract success with warnings CI/CD statusGrzegorz Bizon2017-01-114-32/+49
| | | | | |
* | | | | | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into ↵Grzegorz Bizon2017-01-212-16/+32
| |/ / / / |/| | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !8573
* | | | | Revert "Merge branch 'backport-fix-load-error' into 'master'"Stan Hu2017-01-211-3/+3
| | | | | | | | | | | | | | | This reverts merge request !8671
* | | | | Don't define ApplicationSetting defaults in a constantbackport-fix-load-errorRémy Coutable2017-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'fix/import-users' into 'master' Rémy Coutable2017-01-202-14/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import no longer mapping users as admin Closes #25346 See merge request !8625
| * | | | | fix member mapper specfix/import-usersJames Lopez2017-01-201-2/+0
| | | | | |
| * | | | | fix typoJames Lopez2017-01-191-1/+1
| | | | | |
| * | | | | fix and refactor note user mappingJames Lopez2017-01-182-9/+3
| | | | | |
| * | | | | added spec replicating the problemJames Lopez2017-01-181-1/+1
| | | | | |
| * | | | | do not map usersat all unless adminJames Lopez2017-01-181-2/+2
| | | | | |
* | | | | | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' Robert Speicher2017-01-202-32/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't persist application settings in test env See merge request !8573
| * | | | | | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-envRémy Coutable2017-01-152-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Move default values to ApplicationSetting::DEFAULTS and use it in ↵Rémy Coutable2017-01-151-29/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CurrentSettings Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Fix specsKamil Trzcinski2017-01-191-1/+1
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-198-1/+133
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'feature/gitaly-feature-flag' into 'master' Robert Speicher2017-01-191-1/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly feature flag See merge request !8440
| | * | | | | | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flagAhmad Sherif2017-01-181-1/+8
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-194-0/+88
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document presenters Closes #23563 See merge request !8480
| | * | | | | | More improvements to presenters23563-document-presentersRémy Coutable2017-01-182-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | | Improve presenter factoryRémy Coutable2017-01-182-39/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status