summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-141-3/+9
|\
| * Include project in BatchLoader key to prevent returning blobs for the wrong p...Douwe Maan2017-12-141-3/+9
* | sorting for tags apihaseeb2017-12-141-1/+3
* | Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-141-1/+1
|\ \
| * | Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-141-1/+1
* | | Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'...Kamil Trzciński2017-12-141-1/+0
|\ \ \ | |_|/ |/| |
| * | Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manualShinya Maeda2017-12-141-1/+0
* | | Merge branch 'tc-correct-email-in-reply-to' into 'master'Sean McGivern2017-12-143-7/+29
|\ \ \
| * | | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-toToon Claes2017-12-132-8/+9
| * | | Make mail notifications of discussion notes In-Reply-To of each otherToon Claes2017-12-133-5/+26
* | | | Merge branch '25317-prioritize-author-date-over-commit' into 'master'Sean McGivern2017-12-141-2/+2
|\ \ \ \
| * | | | 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-111-1/+1
* | | | | Merge branch 'dm-dedicated-sidekiq-queues' into 'master'Sean McGivern2017-12-1422-31/+145
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add rubocops to ensure Sidekiq workers include ApplicationWorker and don't ma...Douwe Maan2017-12-131-2/+2
| * | | | Use a dedicated queue for each workerDouwe Maan2017-12-1222-30/+144
* | | | | Merge branch '38869-datetime' into 'master'Tim Zallmann2017-12-1419-133/+152
|\ \ \ \ \
| * | | | | Fixes after review38869-datetimeFilipa Lacerda2017-12-131-3/+1
| * | | | | Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-13115-1336/+1323
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-11138-637/+1115
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 38869-datetimeFilipa Lacerda2017-12-0763-289/+627
| |\ \ \ \ \ \ \
| * | | | | | | | Export date utility functions as ES6 modulesFilipa Lacerda2017-12-0719-136/+157
* | | | | | | | | Merge branch 'issue-description-field-typo' into 'master'Fatih Acet2017-12-131-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into issue-description-field-typoMarcus Amargi2017-12-1294-614/+598
| |\ \ \ \ \ \ \ \
| * | | | | | | | | corrected typo in quick action data attributeMarcus Amargi2017-12-111-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '13695-order-contributors-in-api' into 'master'Rémy Coutable2017-12-132-2/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds ordering to projects contributors in APIJacopo2017-12-132-2/+21
* | | | | | | | | | Merge branch 'winh-unify-modals' into 'master'Filipa Lacerda2017-12-1312-60/+54
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename recaptcha-dialog to recaptcha-modalWinnie Hellmann2017-12-125-13/+13
| * | | | | | | | | | Rename popup-dialog to modalWinnie Hellmann2017-12-129-47/+41
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '33926-update-issuable-icons' into 'master'Annabel Dunstone Gray2017-12-137-14/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-137-14/+26
* | | | | | | | | | | Merge branch 'issue_41021' into 'master'Sean McGivern2017-12-134-3/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Prevent worker that updates merge requests head pipeline from failing jobsFelipe Artur2017-12-134-3/+27
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | 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 'fix-create-mr-from-issue-with-template' into 'master'Rémy Coutable2017-12-131-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Execute quick actions when creating MR from issuefix-create-mr-from-issue-with-templateSean McGivern2017-12-131-2/+4
* | | | | | | | | | | Merge branch 'new-nav-tech-debt' into 'master'Phil Hughes2017-12-138-17/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Rename page-with-sidebar to layout-pagenew-nav-tech-debtAnnabel Dunstone Gray2017-12-087-12/+12
| * | | | | | | | | | Remove page-with-new-nav classAnnabel Dunstone Gray2017-12-083-5/+2
* | | | | | | | | | | Export old code into es6 modulesFilipa Lacerda2017-12-1311-666/+650
* | | | | | | | | | | Use relative URL for projects to avoid storing domainsKushal Pandya2017-12-131-1/+1
* | | | | | | | | | | Merge branch '40468-empty-states' into 'master'Tim Zallmann2017-12-138-49/+68
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adds i18n40468-empty-statesFilipa Lacerda2017-12-125-19/+20
| * | | | | | | | | | | Center cluster titleFilipa Lacerda2017-12-121-1/+1
| * | | | | | | | | | | Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-1283-326/+438
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Improve empty states for TODOs and issuesFilipa Lacerda2017-12-112-5/+8
| * | | | | | | | | | | | Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-1193-470/+931
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update merge request empty stateFilipa Lacerda2017-12-071-7/+8