Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch '38171-workaround' into 'master' | Robert Speicher | 2017-09-22 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Workaround for n+1 in Projects::TreeController#show38171-workaround | Andrew Newdigate | 2017-09-22 | 1 | -1/+4 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master' | Douwe Maan | 2017-09-22 | 10 | -22/+175 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Allow the git circuit breaker to correctly handle missing repository storages | Nick Thomas | 2017-09-22 | 10 | -22/+175 | |
* | | | | | | | | | | | Merge branch 'docs-update-ux-guide' into 'master' | Marcia Ramos | 2017-09-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | fix typo in icons sectiondocs-update-ux-guide | Sarrah Vesselov | 2017-09-22 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge branch 'post_receive_n_plus_1_workaround' into 'master' | Robert Speicher | 2017-09-22 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Workaround for #38259 | Andrew Newdigate | 2017-09-22 | 1 | -2/+5 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'dm-group-share-lock-default-help' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Inform user that current shared projects will remain shareddm-group-share-lock-default-help | Douwe Maan | 2017-09-22 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge branch 'remove-redundant-icons' into 'master' | Annabel Dunstone Gray | 2017-09-22 | 6 | -29/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Removed old icons from project page | Phil Hughes | 2017-09-22 | 6 | -29/+3 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'ee-to-ce-2017-09-22' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -7/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Don't show it if there's no project.ee-to-ce-2017-09-22 | Lin Jen-Shin | 2017-09-22 | 1 | -7/+8 | |
* | | | | | | | | | | | | Merge branch 'winh-i18-branches-page' into 'master' | Phil Hughes | 2017-09-22 | 4 | -66/+79 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Make branches page translatable | Winnie Hellmann | 2017-09-22 | 4 | -66/+79 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'jej/demonstrate-details-summary' into 'master' | Achilleas Pipinellis | 2017-09-22 | 1 | -0/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Demonstrate <details> and <summary> tags in doc/user/markdown.mdjej/demonstrate-details-summary | James Edwards-Jones | 2017-09-15 | 1 | -0/+24 | |
* | | | | | | | | | | | | Merge branch 'feature/migrate-repository-diff' into 'master' | Douwe Maan | 2017-09-22 | 5 | -16/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Migrate Gitlab::Git::Repository#diff to Gitalyfeature/migrate-repository-diff | Ahmad Sherif | 2017-09-21 | 5 | -16/+61 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ee-add-project-repository-storages-index' into 'master' | Douwe Maan | 2017-09-22 | 3 | -1/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Index projects on repository storage | Nick Thomas | 2017-09-21 | 3 | -1/+26 | |
* | | | | | | | | | | | | Merge branch 'replace_project_shortcuts.feature' into 'master' | Rémy Coutable | 2017-09-22 | 6 | -126/+119 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Replace the 'project/shortcuts.feature' spinach test with an rspec analogreplace_project_shortcuts.feature | Vitaliy @blackst0ne Klachkov | 2017-09-22 | 6 | -126/+119 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cev10.1.0.pre | Jarka Kadlecova | 2017-09-22 | 7 | -27/+116 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch '38197-fix-ImapAuthenticationCheck' into 'master' | Douwe Maan | 2017-09-22 | 2 | -17/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Fix rake gitlab:incoming_email:check and make it38197-fix-ImapAuthenticationCheck | Lin Jen-Shin | 2017-09-22 | 2 | -17/+33 | |
| * | | | | | | | | | | | | Merge branch '38234-reserve-refs-replace' into 'master' | Rémy Coutable | 2017-09-22 | 2 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Reserve refs/replace cos `git-replace` is using it38234-reserve-refs-replace | Lin Jen-Shin | 2017-09-22 | 2 | -0/+6 | |
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch '33328-usage-ping-for-gitlab-features-and-components' into 'master' | Rémy Coutable | 2017-09-22 | 3 | -10/+77 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Adds gitlab features and components to usage ping data.33328-usage-ping-for-gitlab-features-and-components | Tiago Botelho | 2017-09-21 | 3 | -10/+77 | |
| | | |_|_|/ / / / / / / | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | Update CHANGELOG.md for 10.0.0 | Jarka Kadlecova | 2017-09-22 | 166 | -813/+180 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'sh-blob-raw-check' into 'master' | Douwe Maan | 2017-09-22 | 2 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Ensure that Blob.raw returns always returns a valid blob objectsh-blob-raw-check | Stan Hu | 2017-09-21 | 2 | -0/+5 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch '32782-i18n-support-pagination' into 'master' | Tim Zallmann | 2017-09-22 | 2 | -79/+100 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add unextracted strings for i18n32782-i18n-support-pagination | kushalpandya | 2017-09-21 | 1 | -75/+94 | |
| * | | | | | | | | | | | Add i18n support for pagination test | kushalpandya | 2017-09-21 | 1 | -4/+6 | |
* | | | | | | | | | | | | Merge branch 'emoji-dom-size' into 'master' | Fatih Acet | 2017-09-22 | 2 | -6/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Remove eslint-disable, and use arrow function.emoji-dom-size | Bryce Johnson | 2017-09-20 | 1 | -3/+2 | |
| * | | | | | | | | | | | Reverse order in showMenuElement for readability. | Bryce Johnson | 2017-09-20 | 1 | -2/+2 | |
| * | | | | | | | | | | | Move display:none to emoji-menu base class. | Bryce Johnson | 2017-09-20 | 1 | -4/+1 | |
| * | | | | | | | | | | | Remove emoji-menu from the render tree when hidden. | Bryce Johnson | 2017-09-19 | 2 | -6/+47 | |
* | | | | | | | | | | | | Merge branch '38016-fix-bad-link-on-gitlab-omnibus-helm-chart-page-docs' into... | Achilleas Pipinellis | 2017-09-22 | 1 | -15/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix link, resolve inconsistent examples38016-fix-bad-link-on-gitlab-omnibus-helm-chart-page-docs | Joshua Lambert | 2017-09-18 | 1 | -15/+3 | |
* | | | | | | | | | | | | | Merge branch 'backport-ee-2983' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -6/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Simplify a test | Nick Thomas | 2017-09-21 | 1 | -6/+1 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch '36231-better-svg-usage-in-the-frontend' into 'master' | Phil Hughes | 2017-09-22 | 74 | -280/+3885 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Resolve "Better SVG Usage in the Frontend" | Tim Zallmann | 2017-09-22 | 74 | -280/+3885 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'add-view-replaced-file-link' into 'master' | Rémy Coutable | 2017-09-22 | 6 | -12/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add view replaced file link for image diffsadd-view-replaced-file-link | Clement Ho | 2017-09-20 | 6 | -12/+53 | |
| | |/ / / / / / / / / | |/| | | | | | | | | |