Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' | Grzegorz Bizon | 2017-01-25 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Remove unneeded code and fix offensesbackport-ee-changes-for-build-minutes | Kamil Trzcinski | 2017-01-25 | 2 | -25/+1 | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui... | Kamil Trzcinski | 2017-01-24 | 30 | -172/+352 | |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||||
| * | | | | | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_... | Kamil Trzcinski | 2017-01-20 | 3 | -2/+27 | |
* | | | | | | | Merge branch 'no_project_notes' into 'master' | Sean McGivern | 2017-01-25 | 3 | -4/+8 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | address comments | Jarka Kadlecova | 2017-01-25 | 1 | -0/+1 | |
| * | | | | | | | make mentions working when project not specified | Jarka Kadlecova | 2017-01-18 | 3 | -5/+8 | |
* | | | | | | | | Merge branch 'grapify-branch-api' into 'master' | Rémy Coutable | 2017-01-25 | 1 | -6/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Grapify last endpoint of the branches APIgrapify-branch-api | Robert Schilling | 2017-01-24 | 1 | -6/+1 | |
* | | | | | | | | | Merge branch 'mrchrisw/rake-redis' into 'master' | Stan Hu | 2017-01-25 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add redis version to info rake taskmrchrisw/rake-redis | Chris Wilson | 2017-01-24 | 1 | -1/+4 | |
* | | | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' | Robert Speicher | 2017-01-24 | 3 | -34/+16 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Rescue from ActiveRecord::UnknownAttributeError and fallback to fake settingsdont-persist-application-settings-in-test-env-bis | Rémy Coutable | 2017-01-23 | 2 | -5/+3 | |
| * | | | | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' " | Grzegorz Bizon | 2017-01-23 | 2 | -32/+16 | |
* | | | | | | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast... | Sean McGivern | 2017-01-24 | 2 | -1/+31 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Search feature: redirects to commit page if query is commit sha and only comm... | YarNayar | 2017-01-24 | 2 | -1/+13 | |
| * | | | | | | | | | Allows to search within project by commit's hash | YarNayar | 2017-01-24 | 1 | -1/+19 | |
* | | | | | | | | | | Merge branch 'zj-mattermost-api-update' into 'master' | Grzegorz Bizon | 2017-01-24 | 3 | -8/+18 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Small update to the Mattermost APIzj-mattermost-api-update | Z.J. van de Weg | 2017-01-24 | 3 | -8/+18 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'grapify-deploy-keys' into 'master' | Rémy Coutable | 2017-01-24 | 1 | -9/+8 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Grapify all endpoints of the deploy keys APIgrapify-deploy-keys | Robert Schilling | 2017-01-23 | 1 | -9/+8 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'rs-pick-security-fixes' into 'master' | Robert Speicher | 2017-01-23 | 7 | -37/+44 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Merge branch 'fix-guest-access-posting-to-notes' into 'security' | Robert Speicher | 2017-01-23 | 1 | -10/+16 | |
| * | | | | | | | | | Merge branch 'fix-api-mr-permissions' into 'security' | Robert Speicher | 2017-01-23 | 5 | -24/+21 | |
| * | | | | | | | | | Merge branch 'fix-users-deleting-public-deployment-keys' into 'security' | Robert Speicher | 2017-01-23 | 1 | -3/+7 | |
* | | | | | | | | | | Merge branch '22619-add-an-email-address-to-unsubscribe-list-header-in-email'... | Douwe Maan | 2017-01-23 | 7 | -46/+103 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Handles unsubscribe from notifications via email | Pawel Chojnacki | 2017-01-13 | 7 | -46/+103 | |
* | | | | | | | | | | | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' | Douwe Maan | 2017-01-23 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Allow creating protected branch when it doesn't exist | Pawel Chojnacki | 2017-01-13 | 1 | -1/+3 | |
* | | | | | | | | | | | Merge branch '22974-trigger-service-events-through-api' into 'master' | Douwe Maan | 2017-01-23 | 1 | -3/+45 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | adds test suite22974-trigger-service-events-through-api | Tiago Botelho | 2017-01-22 | 1 | -3/+2 | |
| * | | | | | | | | | | adds events to services api deserialization | Tiago Botelho | 2017-01-22 | 1 | -3/+46 | |
* | | | | | | | | | | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' | Kamil Trzciński | 2017-01-23 | 7 | -53/+94 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Add a default status const to common status concern | Grzegorz Bizon | 2017-01-18 | 1 | -1/+1 | |
| * | | | | | | | | | | Extract compound statuses method in status factory | Grzegorz Bizon | 2017-01-18 | 1 | -3/+7 | |
| * | | | | | | | | | | Use detailed status for failed but allowed builds | Grzegorz Bizon | 2017-01-12 | 1 | -2/+5 | |
| * | | | | | | | | | | Expose methods that match statuses in status factories | Grzegorz Bizon | 2017-01-12 | 1 | -15/+10 | |
| * | | | | | | | | | | Make it possible to combine extended CI/CD statuses | Grzegorz Bizon | 2017-01-12 | 1 | -6/+12 | |
| * | | | | | | | | | | Add extended status for build failed but allowed to | Grzegorz Bizon | 2017-01-11 | 1 | -0/+27 | |
| * | | | | | | | | | | Add concrete success warning status to stage factory | Grzegorz Bizon | 2017-01-11 | 4 | -18/+7 | |
| * | | | | | | | | | | Extract abstract success with warnings CI/CD status | Grzegorz Bizon | 2017-01-11 | 4 | -32/+49 | |
* | | | | | | | | | | | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'ma... | Grzegorz Bizon | 2017-01-21 | 2 | -16/+32 | |
| |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Revert "Merge branch 'backport-fix-load-error' into 'master'" | Stan Hu | 2017-01-21 | 1 | -3/+3 | |
* | | | | | | | | | | Don't define ApplicationSetting defaults in a constantbackport-fix-load-error | Rémy Coutable | 2017-01-20 | 1 | -3/+3 | |
* | | | | | | | | | | Merge branch 'fix/import-users' into 'master' | Rémy Coutable | 2017-01-20 | 2 | -14/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | fix member mapper specfix/import-users | James Lopez | 2017-01-20 | 1 | -2/+0 | |
| * | | | | | | | | | | fix typo | James Lopez | 2017-01-19 | 1 | -1/+1 | |
| * | | | | | | | | | | fix and refactor note user mapping | James Lopez | 2017-01-18 | 2 | -9/+3 | |
| * | | | | | | | | | | added spec replicating the problem | James Lopez | 2017-01-18 | 1 | -1/+1 | |
| * | | | | | | | | | | do not map usersat all unless admin | James Lopez | 2017-01-18 | 1 | -2/+2 |