summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added piwik_js_cdn_url so we are able to have piwik.js on our CDN38168-cdn-support-for-piwik-analytics-platformTim Zallmann2017-09-223-3/+8
* 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | IssueNotes: Switch back to Write pane when note cancel or submit.acet-switch-markdown-paneFatih Acet2017-09-221-1/+3
|/ / / / / /
* | | | | | Merge branch 'winh-upgrade-nokogiri' into 'master'Robert Speicher2017-09-212-5/+5
|\ \ \ \ \ \
| * | | | | | Upgrade Nokogiri because of CVE-2017-9050winh-upgrade-nokogiriWinnie Hellmann2017-09-212-5/+5
* | | | | | | Merge branch 'acet-fix-comment-form-resize' into 'master'Jacob Schatz2017-09-212-0/+22
|\ \ \ \ \ \ \
| * | | | | | | IssueNotes: Resize comment form after note submit and discard.acet-fix-comment-form-resizeFatih Acet2017-09-212-0/+22
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'tc-bump-version-10.1-pre' into 'master'Robert Speicher2017-09-211-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Bump VERSION to 10.1.0-preToon Claes2017-09-211-1/+1
|/ / / / / /
* | | | | | Merge branch 'cache-csrf-token' into 'master'Phil Hughes2017-09-215-12/+112
|\ \ \ \ \ \
| * | | | | | Standardize access to CSRF token in JavaScriptBryce Johnson2017-09-215-12/+112
|/ / / / / /
* | | | | | Merge branch 'hide-frontmatter-help-page' into 'master'Robert Speicher2017-09-211-2/+8
|\ \ \ \ \ \
| * | | | | | Do not show YAML frontmatter for doc pages under /helpAchilleas Pipinellis2017-09-191-2/+8
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'force-two-up-view' into 'master'Filipa Lacerda2017-09-212-6/+19
|\ \ \ \ \ \
| * | | | | | [skip ci] Add changelogforce-two-up-viewClement Ho2017-09-201-0/+5
| * | | | | | Force two up viewClement Ho2017-09-201-6/+14
| |/ / / / /
* | | | | | Merge branch 'bvl-transient-failure-health-controller-spec' into 'master'Douwe Maan2017-09-211-2/+2
|\ \ \ \ \ \
| * | | | | | Don't memoize storage configuration on `FsShardsCheck`bvl-transient-failure-health-controller-specBob Van Landuyt2017-09-211-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'dm-closing-issue-urls' into 'master'Robert Speicher2017-09-213-3/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptionsdm-closing-issue-urlsDouwe Maan2017-09-213-3/+8
* | | | | | Merge branch '32894-update-ux-icon-documentation' into 'master'Marcia Ramos2017-09-212-12/+10
|\ \ \ \ \ \
| * | | | | | update spacing32894-update-ux-icon-documentationsarrahvesselov2017-09-201-0/+4
| * | | | | | updated verbiage and added todosarrahvesselov2017-09-201-1/+4
| * | | | | | added icon image and updated verbiagesarrahvesselov2017-09-192-12/+3
View Lorry Controller Status