summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix 500 error when diff context line has broken encoding42332-actionview-template-error-366-524-out-of-rangeSean McGivern2018-02-223-1/+38
* Merge branch 'move-project-pages-to-rspec' into 'master'Rémy Coutable2018-02-213-241/+202
|\
| * Move project pages spinach tests to RspecSemyon Pupkov2018-02-213-241/+202
* | Merge branch 'more-dispatcher-refactoring' into 'master'Jacob Schatz2018-02-2119-119/+35
|\ \
| * | use DOMContentLoaded event over jQuery .ready to ensure execution ordermore-dispatcher-refactoringMike Greiling2018-02-211-1/+1
| * | migrate admin:* to static bundleMike Greiling2018-02-212-4/+1
| * | migrate omniauth_callbacks:* to static bundleMike Greiling2018-02-212-8/+1
| * | migrate sessions:* to static bundleMike Greiling2018-02-212-8/+1
| * | migrate projects:clusters:* to static bundleMike Greiling2018-02-215-16/+14
| * | migrate dashboard:activity to static bundleMike Greiling2018-02-212-6/+1
| * | migrate projects:merge_requests:show to static bundleMike Greiling2018-02-211-2/+0
| * | migrate projects:releases:edit to static bundleMike Greiling2018-02-212-6/+1
| * | migrate projects:services:edit to static bundleMike Greiling2018-02-212-7/+2
| * | migrate projects:tags:new to static bundleMike Greiling2018-02-212-7/+2
| * | migrate projects:snippets:* to static bundleMike Greiling2018-02-214-21/+4
| * | migrate snippets:show to static bundleMike Greiling2018-02-212-11/+5
| * | migrate snippets:* to static bundleMike Greiling2018-02-213-22/+2
| |/
* | Merge branch 'docs-project-labels' into 'master'Achilleas Pipinellis2018-02-211-4/+4
|\ \
| * | Update wording docs labelsVictor Wu2018-02-211-4/+4
|/ /
* | Merge branch 'query-counting-should-not-include-cached-queries' into 'master'Yorick Peterse2018-02-212-10/+27
|\ \
| * | Do not count rails sql cache as queries in query limitingquery-counting-should-not-include-cached-queriesDylan Griffith2018-02-212-10/+27
| |/
* | Merge branch 'upgrade-frontend-build-dependencies' into 'master'Tim Zallmann2018-02-213-917/+1966
|\ \ | |/ |/|
| * approve change in dependenciesupgrade-frontend-build-dependenciesMike Greiling2018-02-201-0/+6
| * move babel-eslint to devDependenciesMike Greiling2018-02-201-1/+1
| * update karma dependenciesMike Greiling2018-02-202-474/+380
| * approve change in dependenciesMike Greiling2018-02-201-0/+6
| * upgrade several webpack loadersMike Greiling2018-02-202-155/+317
| * update nodemonMike Greiling2018-02-202-191/+199
| * upgrade various webpack pluginsMike Greiling2018-02-202-172/+324
| * approve change in dependenciesMike Greiling2018-02-201-2/+8
| * upgrade webpack and webpack-dev-serverMike Greiling2018-02-202-53/+856
* | Merge branch 'jquery3' into 'master'Jacob Schatz2018-02-2074-238/+1106
|\ \
| * | Update to jQuery 3.Jacob Schatz2018-02-2074-238/+1106
|/ /
* | Merge branch 'issue-index-refactor' into 'master'Clement Ho2018-02-202-1/+11
|\ \
| * | Refactor issue index filtered searchissue-index-refactorJacob Schatz2018-02-122-1/+11
* | | Merge branch 'refactor-jobs-show-haml' into 'master'Jacob Schatz2018-02-204-8/+5
|\ \ \
| * | | Remove export from pagesrefactor-jobs-show-hamlClement Ho2018-02-161-1/+1
| * | | Merge branch 'master' into 'refactor-jobs-show-haml'Clement Ho2018-02-16126-635/+1223
| |\ \ \
| * | | | Add dispatcher imports for job details bundleClement Ho2018-02-155-9/+11
* | | | | Merge branch 'docs-no-js' into 'master'Tim Zallmann2018-02-201-0/+3
|\ \ \ \ \
| * | | | | Add excerpt about not supporting GitLab running without JavascriptClement Ho2018-02-201-0/+3
|/ / / / /
* | | | | Merge branch 'update-prometheus-10-5-docs' into 'master'Marcia Ramos2018-02-208-209/+63
|\ \ \ \ \
| * | | | | One last item of feedbackJoshua Lambert2018-02-201-1/+1
| * | | | | FeedbackJoshua Lambert2018-02-204-3/+14
| * | | | | Update NGINX docsupdate-prometheus-10-5-docsJoshua Lambert2018-02-201-8/+7
| * | | | | Minor polishJoshua Lambert2018-02-202-6/+4
| * | | | | Fix linksJoshua Lambert2018-02-202-6/+6
| * | | | | Update Prometheus docs for enhanced integrationJoshua Lambert2018-02-205-199/+45
* | | | | | Merge branch 'remove-notes-bundle' into 'master'Clement Ho2018-02-203-11/+4
|\ \ \ \ \ \
| * | | | | | Remove "notes" bundle from webpack configMike Greiling2018-02-203-11/+4
|/ / / / / /