Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipper | Rémy Coutable | 2017-12-14 | 4 | -20/+32 |
* | Merge branch 'issue-description-field-typo' into 'master' | Fatih Acet | 2017-12-13 | 2 | -1/+6 |
|\ | |||||
| * | Merge branch 'master' into issue-description-field-typo | Marcus Amargi | 2017-12-12 | 172 | -1126/+1810 |
| |\ | |||||
| * | | corrected typo in quick action data attribute | Marcus Amargi | 2017-12-11 | 2 | -1/+6 |
* | | | Merge branch '13695-order-contributors-in-api' into 'master' | Rémy Coutable | 2017-12-13 | 10 | -6/+198 |
|\ \ \ | |||||
| * | | | Adds ordering to projects contributors in API | Jacopo | 2017-12-13 | 10 | -6/+198 |
* | | | | Merge branch 'winh-unify-modals' into 'master' | Filipa Lacerda | 2017-12-13 | 21 | -99/+95 |
|\ \ \ \ | |||||
| * | | | | Update UX guidewinh-unify-modals | Winnie Hellmann | 2017-12-12 | 2 | -14/+16 |
| * | | | | Rename recaptcha-dialog to recaptcha-modal | Winnie Hellmann | 2017-12-12 | 7 | -18/+18 |
| * | | | | Rename popup-dialog to modal | Winnie Hellmann | 2017-12-12 | 14 | -67/+61 |
| | |/ / | |/| | | |||||
* | | | | Merge branch '33926-update-issuable-icons' into 'master' | Annabel Dunstone Gray | 2017-12-13 | 9 | -15/+32 |
|\ \ \ \ | |||||
| * | | | | Update issuable status icons33926-update-issuable-icons | Eric Eastwood | 2017-12-13 | 9 | -15/+32 |
* | | | | | Merge branch 'pawel/cache_feature_check_for_5_minutes_for_method_call' into '... | Robert Speicher | 2017-12-13 | 2 | -1/+48 |
|\ \ \ \ \ | |||||
| * | | | | | fix test case description | Pawel Chojnacki | 2017-12-13 | 1 | -1/+1 |
| * | | | | | Use class variable and add rubocop exceptionpawel/cache_feature_check_for_5_minutes_for_method_call | Pawel Chojnacki | 2017-12-12 | 1 | -0/+2 |
| * | | | | | Expire feature flag cache after 1minute | Pawel Chojnacki | 2017-12-12 | 2 | -6/+4 |
| * | | | | | use class variables instead of CONSTANTs | Pawel Chojnacki | 2017-12-12 | 2 | -8/+12 |
| * | | | | | move call_measurement_enabled? method to the bottom of the file | Pawel Chojnacki | 2017-12-12 | 1 | -11/+11 |
| * | | | | | Use AtomicFixNum to implement CAS isolated cache update. | Pawel Chojnacki | 2017-12-12 | 2 | -14/+16 |
| * | | | | | Implemente measurement enabled cache using AtomicReference | Pawel Chojnacki | 2017-12-12 | 2 | -20/+15 |
| * | | | | | Set cache expire only once the cache is filled, | Pawel Chojnacki | 2017-12-12 | 1 | -1/+4 |
| * | | | | | Implement simple in memory cache that expires after 5 minutes | Pawel Chojnacki | 2017-12-12 | 2 | -13/+43 |
| * | | | | | Cache feature check for 5 minutes for MethodCall instrumentation toggle | Pawel Chojnacki | 2017-12-12 | 2 | -1/+14 |
* | | | | | | Merge branch 'add-tcp-check-rake-task' into 'master' | Rémy Coutable | 2017-12-13 | 5 | -0/+121 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add a gitlab:tcp_check rake task | Nick Thomas | 2017-12-13 | 5 | -0/+121 |
* | | | | | | | Merge branch 'issue_41021' into 'master' | Sean McGivern | 2017-12-13 | 8 | -8/+62 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Prevent worker that updates merge requests head pipeline from failing jobs | Felipe Artur | 2017-12-13 | 8 | -8/+62 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'zj-perf-bar-default-dev' into 'master' | Robert Speicher | 2017-12-13 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Enable the performance bar in dev environments | Zeger-Jan van de Weg | 2017-12-13 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'docs-admin-update' into 'master' | Achilleas Pipinellis | 2017-12-13 | 5 | -4/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Docs: Update admin docs | Marcia Ramos | 2017-12-13 | 5 | -4/+17 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'bvl-backport-migration-spec-changes-to-ce' into 'master' | Douwe Maan | 2017-12-13 | 4 | -29/+31 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Create models directly in migration specsbvl-backport-migration-spec-changes-to-ce | Bob Van Landuyt | 2017-12-12 | 4 | -29/+31 |
* | | | | | | | | | Merge branch 'fix-create-mr-from-issue-with-template' into 'master' | Rémy Coutable | 2017-12-13 | 3 | -2/+21 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Execute quick actions when creating MR from issuefix-create-mr-from-issue-with-template | Sean McGivern | 2017-12-13 | 3 | -2/+21 |
* | | | | | | | | | | Merge branch 'docs/troubleshooting-git' into 'master' | Marcia Ramos | 2017-12-13 | 2 | -0/+86 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Refactor Git troubleshooting docsdocs/troubleshooting-git | Achilleas Pipinellis | 2017-12-13 | 1 | -48/+47 |
| * | | | | | | | | | | Add new "Troubleshooting Git" page to General documentation (Admin). | Ian Scorer | 2017-12-13 | 2 | -0/+87 |
* | | | | | | | | | | | Merge branch 'docs/api-nil' into 'master' | Marcia Ramos | 2017-12-13 | 2 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | [API] Document how to unassign labels, milestones, and assigneesdocs/api-nil | Achilleas Pipinellis | 2017-12-01 | 2 | -7/+7 |
* | | | | | | | | | | | | Merge branch 'docs/ci-ssh-keys' into 'master' | Marcia Ramos | 2017-12-13 | 3 | -87/+177 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Make usage of SSH keys in CI/CD more cleardocs/ci-ssh-keys | Achilleas Pipinellis | 2017-12-13 | 3 | -87/+177 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'update-dependencies-license-list' into 'master' | LUKE BENNETT | 2017-12-13 | 1 | -1070/+27 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Updates dependencies license listupdate-dependencies-license-list | Tiago Botelho | 2017-12-13 | 1 | -1070/+27 |
* | | | | | | | | | | | | Merge branch '10-3-gitignore' into 'master' | Tiago | 2017-12-13 | 18 | -63/+150 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Ran bin/rake gitlab:update_templates10-3-gitignore | Luke Bennett | 2017-12-13 | 18 | -63/+150 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch '10-3-update-guide' into 'master' | Tiago | 2017-12-13 | 1 | -0/+360 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add 10.2-to-10.3.md10-3-update-guide | Luke Bennett | 2017-12-13 | 1 | -0/+360 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch '10-3-installation-from-source' into 'master' | Tiago | 2017-12-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Update name of the stable branch in Clone the Source10-3-installation-from-source | Luke Bennett | 2017-12-13 | 1 | -2/+2 |
| |/ / / / / / / / / / / |