summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon2017-01-252-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove unneeded code and fix offensesbackport-ee-changes-for-build-minutesKamil Trzcinski2017-01-252-25/+1
| * | | | | | Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui...Kamil Trzcinski2017-01-2430-172/+352
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_...Kamil Trzcinski2017-01-203-2/+27
* | | | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-253-4/+8
|\ \ \ \ \ \ \
| * | | | | | | address commentsJarka Kadlecova2017-01-251-0/+1
| * | | | | | | make mentions working when project not specifiedJarka Kadlecova2017-01-183-5/+8
* | | | | | | | Merge branch 'grapify-branch-api' into 'master'Rémy Coutable2017-01-251-6/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Grapify last endpoint of the branches APIgrapify-branch-apiRobert Schilling2017-01-241-6/+1
* | | | | | | | | Merge branch 'mrchrisw/rake-redis' into 'master' Stan Hu2017-01-251-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add redis version to info rake taskmrchrisw/rake-redisChris Wilson2017-01-241-1/+4
* | | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-243-34/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Rescue from ActiveRecord::UnknownAttributeError and fallback to fake settingsdont-persist-application-settings-in-test-env-bisRémy Coutable2017-01-232-5/+3
| * | | | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-232-32/+16
* | | | | | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast...Sean McGivern2017-01-242-1/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Search feature: redirects to commit page if query is commit sha and only comm...YarNayar2017-01-242-1/+13
| * | | | | | | | | Allows to search within project by commit's hashYarNayar2017-01-241-1/+19
* | | | | | | | | | Merge branch 'zj-mattermost-api-update' into 'master' Grzegorz Bizon2017-01-243-8/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Small update to the Mattermost APIzj-mattermost-api-updateZ.J. van de Weg2017-01-243-8/+18
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'grapify-deploy-keys' into 'master' Rémy Coutable2017-01-241-9/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Merge branch 'fix-guest-access-posting-to-notes' into 'security' Robert Speicher2017-01-231-10/+16
| * | | | | | | | | Merge branch 'fix-api-mr-permissions' into 'security'Robert Speicher2017-01-235-24/+21
| * | | | | | | | | Merge branch 'fix-users-deleting-public-deployment-keys' into 'security' Robert Speicher2017-01-231-3/+7
* | | | | | | | | | Merge branch '22619-add-an-email-address-to-unsubscribe-list-header-in-email'...Douwe Maan2017-01-237-46/+103
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handles unsubscribe from notifications via emailPawel Chojnacki2017-01-137-46/+103
* | | | | | | | | | | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' Douwe Maan2017-01-231-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Allow creating protected branch when it doesn't existPawel Chojnacki2017-01-131-1/+3
* | | | | | | | | | | Merge branch '22974-trigger-service-events-through-api' into 'master' Douwe Maan2017-01-231-3/+45
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | 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
| * | | | | | | | | | 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 'ma...Grzegorz Bizon2017-01-212-16/+32
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Revert "Merge branch 'backport-fix-load-error' into 'master'"Stan Hu2017-01-211-3/+3
* | | | | | | | | | Don't define ApplicationSetting defaults in a constantbackport-fix-load-errorRémy Coutable2017-01-201-3/+3
* | | | | | | | | | Merge branch 'fix/import-users' into 'master' Rémy Coutable2017-01-202-14/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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