summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Stop breadcrumbs changing container when in side-by-side diffmr-side-by-side-breadcrumbs-containerPhil Hughes2017-09-253-1/+29
* Merge branch 'ee-to-ce-2017-09-22' into 'master'Rémy Coutable2017-09-221-7/+8
|\
| * Don't show it if there's no project.ee-to-ce-2017-09-22Lin Jen-Shin2017-09-221-7/+8
* | Merge branch 'winh-i18-branches-page' into 'master'Phil Hughes2017-09-224-66/+79
|\ \
| * | Make branches page translatableWinnie Hellmann2017-09-224-66/+79
|/ /
* | Merge branch 'jej/demonstrate-details-summary' into 'master'Achilleas Pipinellis2017-09-221-0/+24
|\ \
| * | Demonstrate <details> and <summary> tags in doc/user/markdown.mdjej/demonstrate-details-summaryJames Edwards-Jones2017-09-151-0/+24
* | | Merge branch 'feature/migrate-repository-diff' into 'master'Douwe Maan2017-09-225-16/+61
|\ \ \
| * | | Migrate Gitlab::Git::Repository#diff to Gitalyfeature/migrate-repository-diffAhmad Sherif2017-09-215-16/+61
* | | | Merge branch 'ee-add-project-repository-storages-index' into 'master'Douwe Maan2017-09-223-1/+26
|\ \ \ \
| * | | | Index projects on repository storageNick Thomas2017-09-213-1/+26
* | | | | Merge branch 'replace_project_shortcuts.feature' into 'master'Rémy Coutable2017-09-226-126/+119
|\ \ \ \ \
| * | | | | Replace the 'project/shortcuts.feature' spinach test with an rspec analogreplace_project_shortcuts.featureVitaliy @blackst0ne Klachkov2017-09-226-126/+119
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-cev10.1.0.preJarka Kadlecova2017-09-227-27/+116
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '38197-fix-ImapAuthenticationCheck' into 'master'Douwe Maan2017-09-222-17/+33
| |\ \ \ \ \ \
| | * | | | | | Fix rake gitlab:incoming_email:check and make it38197-fix-ImapAuthenticationCheckLin Jen-Shin2017-09-222-17/+33
| * | | | | | | Merge branch '38234-reserve-refs-replace' into 'master'Rémy Coutable2017-09-222-0/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Reserve refs/replace cos `git-replace` is using it38234-reserve-refs-replaceLin Jen-Shin2017-09-222-0/+6
| * | | | | | | | Merge branch '33328-usage-ping-for-gitlab-features-and-components' into 'master'Rémy Coutable2017-09-223-10/+77
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Adds gitlab features and components to usage ping data.33328-usage-ping-for-gitlab-features-and-componentsTiago Botelho2017-09-213-10/+77
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Update CHANGELOG.md for 10.0.0Jarka Kadlecova2017-09-22166-813/+180
|/ / / / / / /
* | | | | | | Merge branch 'sh-blob-raw-check' into 'master'Douwe Maan2017-09-222-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Ensure that Blob.raw returns always returns a valid blob objectsh-blob-raw-checkStan Hu2017-09-212-0/+5
| |/ / / / / /
* | | | | | | Merge branch '32782-i18n-support-pagination' into 'master'Tim Zallmann2017-09-222-79/+100
|\ \ \ \ \ \ \
| * | | | | | | Add unextracted strings for i18n32782-i18n-support-paginationkushalpandya2017-09-211-75/+94
| * | | | | | | Add i18n support for pagination testkushalpandya2017-09-211-4/+6
* | | | | | | | Merge branch 'emoji-dom-size' into 'master'Fatih Acet2017-09-222-6/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove eslint-disable, and use arrow function.emoji-dom-sizeBryce Johnson2017-09-201-3/+2
| * | | | | | | | Reverse order in showMenuElement for readability.Bryce Johnson2017-09-201-2/+2
| * | | | | | | | Move display:none to emoji-menu base class.Bryce Johnson2017-09-201-4/+1
| * | | | | | | | Remove emoji-menu from the render tree when hidden.Bryce Johnson2017-09-192-6/+47
* | | | | | | | | Merge branch '38016-fix-bad-link-on-gitlab-omnibus-helm-chart-page-docs' into...Achilleas Pipinellis2017-09-221-15/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix link, resolve inconsistent examples38016-fix-bad-link-on-gitlab-omnibus-helm-chart-page-docsJoshua Lambert2017-09-181-15/+3
* | | | | | | | | | Merge branch 'backport-ee-2983' into 'master'Rémy Coutable2017-09-221-6/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Simplify a testNick Thomas2017-09-211-6/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '36231-better-svg-usage-in-the-frontend' into 'master'Phil Hughes2017-09-2274-280/+3885
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-2274-280/+3885
|/ / / / / / / / /
* | | | | | | | | Merge branch 'add-view-replaced-file-link' into 'master'Rémy Coutable2017-09-226-12/+53
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add view replaced file link for image diffsadd-view-replaced-file-linkClement Ho2017-09-206-12/+53
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'docs/fix-review-docs-cleanup-job' into 'master'Rémy Coutable2017-09-221-3/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not clone the repo when running the review-docs jobsdocs/fix-review-docs-cleanup-jobAchilleas Pipinellis2017-09-211-3/+12
* | | | | | | | | | Merge branch 'replace_project_service.feature' into 'master'Rémy Coutable2017-09-2219-338/+347
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replace the 'project/service.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-2219-338/+347
* | | | | | | | | | | Merge branch 'voogsgerd/gitlab-ce-daniel-legacy-config' into 'master'Rémy Coutable2017-09-222-6/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removed two legacy config optionsvoogsgerd/gitlab-ce-daniel-legacy-configDaniel Voogsgerd2017-09-212-6/+5
* | | | | | | | | | | | Merge branch 'fix-multi-line-hook-output' into 'master'Rémy Coutable2017-09-223-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Display full pre-receive and post-receive hook output in GitLab UIRobin Bobbitt2017-09-213-4/+11
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'acet-fix-double-note-render' into 'master'Jacob Schatz2017-09-225-19/+47
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix rendering double note issue.Fatih Acet2017-09-225-19/+47
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'acet-switch-markdown-pane' into 'master'Jacob Schatz2017-09-221-1/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |