Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'br-add-glossary' into 'master' | Sid Sijbrandij | 2017-11-09 | 1 | -16/+133 | |
|\ \ \ \ \ | ||||||
| * | | | | | add glossary part 2br-add-glossary | Brittany Rohde | 2017-11-07 | 1 | -3/+3 | |
| * | | | | | add glossary part 1 | Brittany Rohde | 2017-11-07 | 1 | -13/+130 | |
* | | | | | | Merge branch 'move-filter-mr-clear-search-spec-to-js' into 'master' | Tim Zallmann | 2017-11-09 | 2 | -16/+19 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Move clear search test to JS to reduce overkillmove-filter-mr-clear-search-spec-to-js | Eric Eastwood | 2017-11-09 | 2 | -16/+19 | |
* | | | | | | | Merge branch '37920-improve-breadcrumbs-clipping' into 'master' | Tim Zallmann | 2017-11-09 | 1 | -4/+18 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Dynamically truncate breadcrumbs37920-improve-breadcrumbs-clipping | Annabel Dunstone Gray | 2017-11-08 | 1 | -3/+14 | |
| * | | | | | | | Remove max-width on desktop | Annabel Dunstone Gray | 2017-11-08 | 1 | -1/+4 | |
* | | | | | | | | Merge branch 'winh-subgroups-api' into 'master' | Rémy Coutable | 2017-11-09 | 4 | -26/+230 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add /groups/:id/subgroups endpoint to API | Winnie Hellmann | 2017-11-09 | 4 | -26/+230 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'dm-avatarable-with-asset-host' into 'master' | Rémy Coutable | 2017-11-09 | 8 | -131/+82 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Always return full avatar URL for private/internal groups/projects when asset... | Douwe Maan | 2017-11-09 | 8 | -131/+82 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'fix-todos-last-page' into 'master' | Rémy Coutable | 2017-11-09 | 3 | -3/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix access to the final page of todos | Sean McGivern | 2017-11-09 | 3 | -3/+8 | |
* | | | | | | | | | Merge branch '39109-reenable-scroll-job' into 'master' | Phil Hughes | 2017-11-09 | 2 | -26/+29 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Enables scroll to bottom once user has scrolled back to bottom in job log | Filipa Lacerda | 2017-11-09 | 2 | -26/+29 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'docs/support-release-tools-132' into 'master' | Sean McGivern | 2017-11-09 | 1 | -15/+23 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use the new simpler `Pick into X.Y` labels workflow after the 7th | Rémy Coutable | 2017-11-09 | 1 | -15/+23 | |
* | | | | | | | | | | Merge branch '39895-cant-set-mattermost-username-channel-from-api' into 'master' | Rémy Coutable | 2017-11-09 | 4 | -1/+33 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix acceptance of username for Mattermost service update via API | Mark Fletcher | 2017-11-08 | 4 | -1/+33 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' ... | Sean McGivern | 2017-11-09 | 4 | -27/+29 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
| * | | | | | | | | | Revert "add metrics tagging to the sidekiq middleware"39958-updatemergerequestsworker-are-failing-on-metric-tagging | micael.bergeron | 2017-11-08 | 4 | -27/+29 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'qa/gb/add-global-qa-scenario-arguments' into 'master' | Rémy Coutable | 2017-11-09 | 11 | -5/+128 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Make it possible to define global scenario attributes | Grzegorz Bizon | 2017-11-09 | 11 | -5/+128 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'github-rake-task-rate-limiting' into 'master' | Douwe Maan | 2017-11-09 | 3 | -3/+36 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Support importing GH projects without rate limitsgithub-rake-task-rate-limiting | Yorick Peterse | 2017-11-08 | 2 | -0/+33 | |
| * | | | | | | | Restore GH enterprise support in the Rake task | Yorick Peterse | 2017-11-08 | 1 | -3/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch '36099-api-responses-missing-x-content-type-options-header' into... | Douwe Maan | 2017-11-08 | 3 | -1/+15 | |
* | | | | | | | Merge branch 'ssrf-protections-round-2' into 'security-10-1' | Douwe Maan | 2017-11-08 | 2 | -1/+19 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'fix-issues-api-list-performance' into 'master' | Stan Hu | 2017-11-08 | 4 | -10/+27 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fail when issuable_meta_data is called on an unlimited collectionfix-issues-api-list-performance | Sean McGivern | 2017-11-07 | 4 | -10/+27 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'github-enterprise-support-importer' into 'master' | Douwe Maan | 2017-11-08 | 3 | -28/+137 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix the GH importer Rake taskgithub-enterprise-support-importer | Yorick Peterse | 2017-11-08 | 1 | -14/+18 | |
| * | | | | | | Restore Enterprise support in the GH importer | Yorick Peterse | 2017-11-08 | 2 | -14/+119 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge branch 'fix/doc/39935-missing-fields-in-merge-request-payload' into 'ma... | Achilleas Pipinellis | 2017-11-08 | 1 | -0/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix issue 39935 : Add created_at and updated_at | Sébastien Le Gall | 2017-11-08 | 1 | -0/+6 | |
* | | | | | | | Merge branch 'gitaly-700-wiki-update-page' into 'master' | Douwe Maan | 2017-11-08 | 3 | -6/+46 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Migrate GitLab::Git::Wiki.update_page to Gitaly | Kim "BKC" Carlbäcker | 2017-11-08 | 3 | -6/+46 | |
* | | | | | | | | Merge branch 'remove-ineffective-service-specs' into 'master' | Filipa Lacerda | 2017-11-08 | 2 | -113/+0 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Remove ineffective Vue service specsremove-ineffective-service-specs | Eric Eastwood | 2017-11-08 | 2 | -113/+0 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'sh-fix-lfs-write-deploy-keys' into 'master' | Rémy Coutable | 2017-11-08 | 5 | -28/+69 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix Error 500 when pushing LFS objects with a write deploy key | Stan Hu | 2017-11-08 | 5 | -28/+69 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'update-upload-documentation' into 'master' | Nick Thomas | 2017-11-08 | 2 | -10/+59 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Added file storage documentation and updated hash storage one | Gabriel Mazetto | 2017-11-08 | 2 | -10/+59 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'dm-notes-for-commit-id' into 'master' | Rémy Coutable | 2017-11-08 | 11 | -29/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use Commit#notes and Note.for_commit_id when possible to make sure we use all...dm-notes-for-commit-id | Douwe Maan | 2017-11-08 | 11 | -29/+16 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'bvl-update-externalization-docs' into 'master' | Achilleas Pipinellis | 2017-11-08 | 1 | -15/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make a note of which files to check in after externalizing stringsbvl-update-externalization-docs | Bob Van Landuyt | 2017-11-08 | 1 | -15/+12 | |
* | | | | | | | | Merge branch '38395-mr-widget-ci' into 'master' | Phil Hughes | 2017-11-08 | 6 | -174/+204 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Resolve "Merge request widget - CI information has different margins" | Filipa Lacerda | 2017-11-08 | 6 | -174/+204 | |
|/ / / / / / / / |