summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-144-20/+32
* Merge branch 'issue-description-field-typo' into 'master'Fatih Acet2017-12-132-1/+6
|\
| * Merge branch 'master' into issue-description-field-typoMarcus Amargi2017-12-12172-1126/+1810
| |\
| * | corrected typo in quick action data attributeMarcus Amargi2017-12-112-1/+6
* | | Merge branch '13695-order-contributors-in-api' into 'master'Rémy Coutable2017-12-1310-6/+198
|\ \ \
| * | | Adds ordering to projects contributors in APIJacopo2017-12-1310-6/+198
* | | | Merge branch 'winh-unify-modals' into 'master'Filipa Lacerda2017-12-1321-99/+95
|\ \ \ \
| * | | | Update UX guidewinh-unify-modalsWinnie Hellmann2017-12-122-14/+16
| * | | | Rename recaptcha-dialog to recaptcha-modalWinnie Hellmann2017-12-127-18/+18
| * | | | Rename popup-dialog to modalWinnie Hellmann2017-12-1214-67/+61
| | |/ / | |/| |
* | | | Merge branch '33926-update-issuable-icons' into 'master'Annabel Dunstone Gray2017-12-139-15/+32
|\ \ \ \
| * | | | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-139-15/+32
* | | | | Merge branch 'pawel/cache_feature_check_for_5_minutes_for_method_call' into '...Robert Speicher2017-12-132-1/+48
|\ \ \ \ \
| * | | | | fix test case descriptionPawel Chojnacki2017-12-131-1/+1
| * | | | | Use class variable and add rubocop exceptionpawel/cache_feature_check_for_5_minutes_for_method_callPawel Chojnacki2017-12-121-0/+2
| * | | | | Expire feature flag cache after 1minutePawel Chojnacki2017-12-122-6/+4
| * | | | | use class variables instead of CONSTANTsPawel Chojnacki2017-12-122-8/+12
| * | | | | move call_measurement_enabled? method to the bottom of the filePawel Chojnacki2017-12-121-11/+11
| * | | | | Use AtomicFixNum to implement CAS isolated cache update.Pawel Chojnacki2017-12-122-14/+16
| * | | | | Implemente measurement enabled cache using AtomicReferencePawel Chojnacki2017-12-122-20/+15
| * | | | | Set cache expire only once the cache is filled,Pawel Chojnacki2017-12-121-1/+4
| * | | | | Implement simple in memory cache that expires after 5 minutesPawel Chojnacki2017-12-122-13/+43
| * | | | | Cache feature check for 5 minutes for MethodCall instrumentation togglePawel Chojnacki2017-12-122-1/+14
* | | | | | Merge branch 'add-tcp-check-rake-task' into 'master'Rémy Coutable2017-12-135-0/+121
|\ \ \ \ \ \
| * | | | | | Add a gitlab:tcp_check rake taskNick Thomas2017-12-135-0/+121
* | | | | | | Merge branch 'issue_41021' into 'master'Sean McGivern2017-12-138-8/+62
|\ \ \ \ \ \ \
| * | | | | | | Prevent worker that updates merge requests head pipeline from failing jobsFelipe Artur2017-12-138-8/+62
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'zj-perf-bar-default-dev' into 'master'Robert Speicher2017-12-131-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Enable the performance bar in dev environmentsZeger-Jan van de Weg2017-12-131-0/+1
* | | | | | | | Merge branch 'docs-admin-update' into 'master'Achilleas Pipinellis2017-12-135-4/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Docs: Update admin docsMarcia Ramos2017-12-135-4/+17
|/ / / / / / / /
* | | | | | | | Merge branch 'bvl-backport-migration-spec-changes-to-ce' into 'master'Douwe Maan2017-12-134-29/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Create models directly in migration specsbvl-backport-migration-spec-changes-to-ceBob Van Landuyt2017-12-124-29/+31
* | | | | | | | | Merge branch 'fix-create-mr-from-issue-with-template' into 'master'Rémy Coutable2017-12-133-2/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Execute quick actions when creating MR from issuefix-create-mr-from-issue-with-templateSean McGivern2017-12-133-2/+21
* | | | | | | | | | Merge branch 'docs/troubleshooting-git' into 'master'Marcia Ramos2017-12-132-0/+86
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor Git troubleshooting docsdocs/troubleshooting-gitAchilleas Pipinellis2017-12-131-48/+47
| * | | | | | | | | | Add new "Troubleshooting Git" page to General documentation (Admin).Ian Scorer2017-12-132-0/+87
* | | | | | | | | | | Merge branch 'docs/api-nil' into 'master'Marcia Ramos2017-12-132-7/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [API] Document how to unassign labels, milestones, and assigneesdocs/api-nilAchilleas Pipinellis2017-12-012-7/+7
* | | | | | | | | | | | Merge branch 'docs/ci-ssh-keys' into 'master'Marcia Ramos2017-12-133-87/+177
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Make usage of SSH keys in CI/CD more cleardocs/ci-ssh-keysAchilleas Pipinellis2017-12-133-87/+177
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'update-dependencies-license-list' into 'master'LUKE BENNETT2017-12-131-1070/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updates dependencies license listupdate-dependencies-license-listTiago Botelho2017-12-131-1070/+27
* | | | | | | | | | | | Merge branch '10-3-gitignore' into 'master'Tiago2017-12-1318-63/+150
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Ran bin/rake gitlab:update_templates10-3-gitignoreLuke Bennett2017-12-1318-63/+150
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '10-3-update-guide' into 'master'Tiago2017-12-131-0/+360
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add 10.2-to-10.3.md10-3-update-guideLuke Bennett2017-12-131-0/+360
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch '10-3-installation-from-source' into 'master'Tiago2017-12-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update name of the stable branch in Clone the Source10-3-installation-from-sourceLuke Bennett2017-12-131-2/+2
| |/ / / / / / / / / / /