Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zj-mr-diff-memoization-bug' into 'master' | Sean McGivern | 2017-12-14 | 3 | -14/+25 |
|\ | |||||
| * | Clear caches before updating MR diffs | Zeger-Jan van de Weg | 2017-12-14 | 3 | -14/+25 |
* | | Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'... | Kamil Trzciński | 2017-12-14 | 3 | -10/+7 |
|\ \ | |||||
| * | | Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manual | Shinya Maeda | 2017-12-14 | 3 | -10/+7 |
* | | | Merge branch 'qa/gb/update-qa-dependencies' into 'master' | Grzegorz Bizon | 2017-12-14 | 3 | -52/+46 |
|\ \ \ | |||||
| * | | | Use new Ruby version 2.4 in GitLab QA images | Grzegorz Bizon | 2017-12-14 | 1 | -1/+1 |
| * | | | Update GitLab QA dependencies | Grzegorz Bizon | 2017-12-14 | 2 | -51/+45 |
* | | | | Merge branch 'gitlab-shell-5-10-3' into 'master' | Grzegorz Bizon | 2017-12-14 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Bump gitlab-shell version to 5.10.3 | Sean McGivern | 2017-12-14 | 1 | -1/+1 |
* | | | | | Merge branch 'tc-correct-email-in-reply-to' into 'master' | Sean McGivern | 2017-12-14 | 6 | -7/+96 |
|\ \ \ \ \ | |||||
| * | | | | | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-to | Toon Claes | 2017-12-13 | 4 | -19/+57 |
| * | | | | | Make mail notifications of discussion notes In-Reply-To of each other | Toon Claes | 2017-12-13 | 5 | -5/+56 |
* | | | | | | Merge branch '25317-prioritize-author-date-over-commit' into 'master' | Sean McGivern | 2017-12-14 | 3 | -3/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix commits_spec25317-prioritize-author-date-over-commit | Annabel Dunstone Gray | 2017-12-13 | 1 | -1/+1 |
| * | | | | | | Change committed text to authored | Annabel Dunstone Gray | 2017-12-13 | 1 | -1/+1 |
| * | | | | | | Use author info on commits list page rather than most recent commit date | Annabel Dunstone Gray | 2017-12-11 | 2 | -1/+6 |
* | | | | | | | Merge branch 'dm-dedicated-sidekiq-queues' into 'master' | Sean McGivern | 2017-12-14 | 45 | -102/+510 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Remove unused queuesdm-dedicated-sidekiq-queues | Douwe Maan | 2017-12-13 | 3 | -4/+17 |
| * | | | | | | Add rubocops to ensure Sidekiq workers include ApplicationWorker and don't ma... | Douwe Maan | 2017-12-13 | 7 | -6/+117 |
| * | | | | | | Update docs | Douwe Maan | 2017-12-12 | 1 | -15/+44 |
| * | | | | | | Use a dedicated queue for each worker | Douwe Maan | 2017-12-12 | 37 | -81/+336 |
* | | | | | | | Merge branch 'update-doc-for-user-group-project-transfers' into 'master' | Douwe Maan | 2017-12-14 | 3 | -10/+15 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Updates doc for user, group & project transfersupdate-doc-for-user-group-project-transfers | Mayra Cabrera | 2017-12-13 | 3 | -10/+15 |
* | | | | | | | Merge branch '38869-datetime' into 'master' | Tim Zallmann | 2017-12-14 | 24 | -234/+251 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixes after review38869-datetime | Filipa Lacerda | 2017-12-13 | 1 | -3/+1 |
| * | | | | | | | Merge branch 'master' into 38869-datetime | Filipa Lacerda | 2017-12-13 | 202 | -1958/+2665 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into 38869-datetime | Filipa Lacerda | 2017-12-11 | 376 | -2333/+5008 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into 38869-datetime | Filipa Lacerda | 2017-12-07 | 155 | -1133/+3373 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Export date utility functions as ES6 modules | Filipa Lacerda | 2017-12-07 | 24 | -237/+256 |
* | | | | | | | | | | | 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 |