summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change text from build to job in flash notice41136-job-erasedAnnabel Dunstone Gray2017-12-141-1/+1
* Merge branch 'rc/update-flipper' into 'master'Robert Speicher2017-12-144-20/+32
|\
| * Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-144-20/+32
* | Merge branch 'ph-es-modules' into 'master'Filipa Lacerda2017-12-1410-121/+67
|\ \
| * | Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-1410-121/+67
* | | Merge branch 'docs-jprovazn-create-from-email' into 'master'Marcia Ramos2017-12-143-5/+12
|\ \ \
| * | | Fixed doc for create MR from emaildocs-jprovazn-create-from-emailJan Provaznik2017-12-123-5/+12
* | | | Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-142-3/+14
|\ \ \ \
| * | | | Clear BatchLoader after each spec to prevent holding onto records longer than...dm-batchloader-projectDouwe Maan2017-12-141-0/+5
| * | | | Include project in BatchLoader key to prevent returning blobs for the wrong p...Douwe Maan2017-12-141-3/+9
| | |/ / | |/| |
* | | | Merge branch '40509_sorting_tags_api' into 'master'Rémy Coutable2017-12-146-5/+65
|\ \ \ \
| * | | | sorting for tags apihaseeb2017-12-146-5/+65
|/ / / /
* | | | Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-143-14/+25
|\ \ \ \
| * | | | Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-143-14/+25
* | | | | Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'...Kamil Trzciński2017-12-143-10/+7
|\ \ \ \ \
| * | | | | Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manualShinya Maeda2017-12-143-10/+7
* | | | | | Merge branch 'qa/gb/update-qa-dependencies' into 'master'Grzegorz Bizon2017-12-143-52/+46
|\ \ \ \ \ \
| * | | | | | Use new Ruby version 2.4 in GitLab QA imagesGrzegorz Bizon2017-12-141-1/+1
| * | | | | | Update GitLab QA dependenciesGrzegorz Bizon2017-12-142-51/+45
* | | | | | | Merge branch 'gitlab-shell-5-10-3' into 'master'Grzegorz Bizon2017-12-141-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Bump gitlab-shell version to 5.10.3Sean McGivern2017-12-141-1/+1
* | | | | | | Merge branch 'tc-correct-email-in-reply-to' into 'master'Sean McGivern2017-12-146-7/+96
|\ \ \ \ \ \ \
| * | | | | | | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-toToon Claes2017-12-134-19/+57
| * | | | | | | Make mail notifications of discussion notes In-Reply-To of each otherToon Claes2017-12-135-5/+56
* | | | | | | | Merge branch '25317-prioritize-author-date-over-commit' into 'master'Sean McGivern2017-12-143-3/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix commits_spec25317-prioritize-author-date-over-commitAnnabel Dunstone Gray2017-12-131-1/+1
| * | | | | | | | Change committed text to authoredAnnabel Dunstone Gray2017-12-131-1/+1
| * | | | | | | | Use author info on commits list page rather than most recent commit dateAnnabel Dunstone Gray2017-12-112-1/+6
* | | | | | | | | Merge branch 'dm-dedicated-sidekiq-queues' into 'master'Sean McGivern2017-12-1445-102/+510
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Remove unused queuesdm-dedicated-sidekiq-queuesDouwe Maan2017-12-133-4/+17
| * | | | | | | | Add rubocops to ensure Sidekiq workers include ApplicationWorker and don't ma...Douwe Maan2017-12-137-6/+117
| * | | | | | | | Update docsDouwe Maan2017-12-121-15/+44
| * | | | | | | | Use a dedicated queue for each workerDouwe Maan2017-12-1237-81/+336
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'update-doc-for-user-group-project-transfers' into 'master'Douwe Maan2017-12-143-10/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Updates doc for user, group & project transfersupdate-doc-for-user-group-project-transfersMayra Cabrera2017-12-133-10/+15
* | | | | | | | Merge branch '38869-datetime' into 'master'Tim Zallmann2017-12-1424-234/+251
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fixes after review38869-datetimeFilipa Lacerda2017-12-131-3/+1
| * | | | | | | Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-13202-1958/+2665
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-11376-2333/+5008
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-07155-1133/+3373
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Export date utility functions as ES6 modulesFilipa Lacerda2017-12-0724-237/+256
* | | | | | | | | | | 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
| | |/ / / / / / / / / / | |/| | | | | | | | | |
View Lorry Controller Status