summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-filter-params' into 'security' bpj-issuable-sidebar-autoupdatebackport-link_to_member_avatarRémy Coutable2016-12-151-1/+3
* Merge branch 'jej-24637-move-issue-visible_to_user-to-finder' into 'security' Sean McGivern2016-12-159-95/+90
* Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-1516-121/+387
* Merge branch 'docs/repocheck-logs' into 'master' Achilleas Pipinellis2016-12-151-13/+23
|\
| * Fix headings in administration/logs.mdAchilleas Pipinellis2016-12-151-14/+14
| * Document `repocheck.log` in logs docsAchilleas Pipinellis2016-12-151-0/+10
* | Merge branch 'katex-math' into 'master' Sean McGivern2016-12-1599-12/+9926
|\ \
| * | Render math in Asciidoc and Markdown with KaTeX using code blocksMunken2016-12-1421-166/+358
| * | More testsMunken2016-12-081-8/+12
| * | More testsMunken2016-12-081-1/+11
| * | Don't double renderMunken2016-12-081-0/+3
| * | Better location for math lexerMunken2016-12-082-22/+21
| * | Removed alias and filenamesMunken2016-12-081-2/+0
| * | Detect whether math is display styleMunken2016-12-081-1/+2
| * | Hacked in Math LexerMunken2016-12-081-0/+27
| * | Math works for inline syntaxMunken2016-12-0885-32/+9651
| * | Working inline math filterMunken2016-12-083-0/+61
* | | Merge branch 'fix-api-docs' into 'master' Achilleas Pipinellis2016-12-151-1/+0
|\ \ \
| * | | Remove duplicated parameter description [ci skip]fix-api-docsRobert Schilling2016-12-151-1/+0
* | | | Merge branch 'gitlab-workhorse-multipart' into 'master' Sean McGivern2016-12-1520-35/+295
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add Gitlab::Middleware::MultipartJacob Vosmaer2016-12-1520-35/+295
* | | | Merge branch 'seed-runner-token' into 'master' Kamil Trzciński2016-12-156-11/+60
|\ \ \ \ | |/ / / |/| | |
| * | | Add changelog entry for seeding the runner request tokenseed-runner-tokenDJ Mountney2016-12-011-0/+5
| * | | Allow users to seed the initial runner registration token using an environmen...DJ Mountney2016-12-015-11/+55
* | | | Merge branch 'fix-slack-pipeline-message-by-api' into 'master' Kamil Trzciński2016-12-153-10/+26
|\ \ \ \
| * | | | Fix Slack pipeline message by APIfix-slack-pipeline-message-by-apiLin Jen-Shin2016-12-133-10/+26
* | | | | Merge branch '22849-ci-build-ref-slug' into 'master' Kamil Trzciński2016-12-156-27/+62
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Introduce $CI_BUILD_REF_SLUGNick Thomas2016-12-136-27/+62
* | | | | Merge branch 'fix/transient-failing-analytics-spec' into 'master' James Lopez2016-12-151-0/+8
|\ \ \ \ \
| * | | | | fix transient timing failure adding timecopfix/transient-failing-analytics-specJames Lopez2016-12-141-0/+8
* | | | | | Merge branch 'delete-more-page-specific-css' into 'master' Jacob Schatz2016-12-1510-40/+14
|\ \ \ \ \ \
| * | | | | | Remove pages/snippets cssdelete-more-page-specific-cssAnnabel Dunstone Gray2016-12-147-31/+11
| * | | | | | Remove unused bootstrap importsAnnabel Dunstone Gray2016-12-141-5/+5
| * | | | | | Shift emojis and icons styles into frameworkAnnabel Dunstone Gray2016-12-145-10/+4
|/ / / / / /
* | | | | | Merge branch 'clean-no-undef' into 'master' Alfredo Sumaran2016-12-15171-214/+611
|\ \ \ \ \ \
| * | | | | | resolve all instances of no-undef eslint rule violationsclean-no-undefMike Greiling2016-12-1488-111/+295
| * | | | | | expand remaining non-explicit eslint-disable blocks and factor out globals wh...Mike Greiling2016-12-1387-107/+320
* | | | | | | Merge branch 'username-exists-root' into 'master' Alfredo Sumaran2016-12-142-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Username exists check respects the relative root URLusername-exists-rootPhil Hughes2016-12-142-1/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'variables' into 'master' Jacob Schatz2016-12-1448-225/+175
|\ \ \ \ \ \ \
| * | | | | | | Finish refactoring graysvariablesAnnabel Dunstone Gray2016-12-1340-135/+110
| * | | | | | | Combining more graysAnnabel Dunstone Gray2016-12-1315-48/+29
| * | | | | | | Remove duplicate shades of gray and blackAnnabel Dunstone Gray2016-12-1318-44/+38
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '22864-kubernetes-service' into 'master' Kamil Trzciński2016-12-1416-1/+384
|\ \ \ \ \ \ \
| * | | | | | | Introduce deployment services, starting with a KubernetesServiceNick Thomas2016-12-1416-1/+384
* | | | | | | | Merge branch 'dont-lint-npm-modules' into 'master' Alfredo Sumaran2016-12-141-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | add node_modules to our eslintignore settingsdont-lint-npm-modulesMike Greiling2016-12-141-0/+1
* | | | | | | | | Merge branch 'fix-navigation-white-space' into 'master' Annabel Dunstone Gray2016-12-148-23/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove white space between nav itemsfix-navigation-white-spaceAlfredo Sumaran2016-12-148-23/+22
* | | | | | | | | | Merge branch '24803-change-cursor-for-ca-stages' into 'master' Alfredo Sumaran2016-12-142-0/+6
|\ \ \ \ \ \ \ \ \ \