Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 41014-bump-svg-version41014-bump-svg-version | Filipa Lacerda | 2017-12-14 | 33 | -236/+297 |
|\ | |||||
| * | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master' | Robert Speicher | 2017-12-14 | 9 | -10/+30 |
| |\ | |||||
| | * | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitaly | Ahmad Sherif | 2017-12-13 | 9 | -10/+30 |
| * | | Merge branch 'docs-add-indexes-monitoring' into 'master' | Achilleas Pipinellis | 2017-12-14 | 6 | -82/+96 |
| |\ \ | |||||
| | * | | Docs: add indexes for monitoring and performance monitoring | Marcia Ramos | 2017-12-14 | 6 | -82/+96 |
| |/ / | |||||
| * | | Merge branch 'clearer-documentation-on-inline-diffs' into 'master' | Achilleas Pipinellis | 2017-12-14 | 2 | -3/+25 |
| |\ \ | |||||
| | * | | clearer-documentation-on-inline-diffs | Dimitrie Hoekstra | 2017-12-14 | 2 | -3/+25 |
| |/ / | |||||
| * | | Merge branch 'docs/commit-diff-discussions-in-mr-context' into 'master' | Achilleas Pipinellis | 2017-12-14 | 4 | -0/+47 |
| |\ \ | |||||
| | * | | Add docs for commit diff discussion in merge requests | micael.bergeron | 2017-12-14 | 4 | -0/+47 |
| * | | | Merge branch 'rc/update-flipper' into 'master' | Robert Speicher | 2017-12-14 | 4 | -20/+32 |
| |\ \ \ | |||||
| | * | | | 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 'ph-es-modules' into 'master' | Filipa Lacerda | 2017-12-14 | 10 | -121/+67 |
| |\ \ \ \ | |||||
| | * | | | | Converted JS modules into exported modulesph-es-modules | Phil Hughes | 2017-12-14 | 10 | -121/+67 |
* | | | | | | Update svg package version | Filipa Lacerda | 2017-12-14 | 2 | -4/+4 |
|/ / / / / | |||||
* | | | | | Merge branch 'docs-jprovazn-create-from-email' into 'master' | Marcia Ramos | 2017-12-14 | 3 | -5/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed doc for create MR from emaildocs-jprovazn-create-from-email | Jan Provaznik | 2017-12-12 | 3 | -5/+12 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'dm-batchloader-project' into 'master' | Sean McGivern | 2017-12-14 | 2 | -3/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Clear BatchLoader after each spec to prevent holding onto records longer than...dm-batchloader-project | Douwe Maan | 2017-12-14 | 1 | -0/+5 |
| * | | | | | Include project in BatchLoader key to prevent returning blobs for the wrong p... | Douwe Maan | 2017-12-14 | 1 | -3/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch '40509_sorting_tags_api' into 'master' | Rémy Coutable | 2017-12-14 | 6 | -5/+65 |
|\ \ \ \ \ | |||||
| * | | | | | sorting for tags api | haseeb | 2017-12-14 | 6 | -5/+65 |
|/ / / / / | |||||
* | | | | | 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 |