summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Actually render old and new sections of parallel diff next to each otherbetter-parallel-diffDouwe Maan2016-07-134-103/+65
* Merge branch 'api-docs-typos' into 'master' Achilleas Pipinellis2016-07-092-44/+51
|\
| * projects: add container_registry_enabled to API docsBen Boeckel2016-06-271-0/+7
| * update_service: remove trailing whitespaceBen Boeckel2016-06-271-1/+1
| * docs: fix some typosBen Boeckel2016-06-272-44/+44
* | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-07-091-1/+1
|\ \
| * | gitlab-org/gitlab-ci-multi-runner#1478 Fixed phpunit command in the official ...kujiy2016-07-081-1/+1
* | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-07-091-1/+1
|\ \ \
| * | | Wrong gitlab-shell versionChristian Decker2016-07-081-1/+1
* | | | Merge branch 'doc-custom-hooks' into 'master' Achilleas Pipinellis2016-07-091-1/+2
|\ \ \ \
| * | | | Fix typo and explain the precedence of STDERR and STDOUTAchilleas Pipinellis2016-07-091-1/+2
* | | | | Merge branch 'dz-subnav-darker' into 'master' Dmitriy Zaporozhets2016-07-092-9/+7
|\ \ \ \ \
| * | | | | Make subnavigation a bit darker colorDmitriy Zaporozhets2016-07-092-9/+7
* | | | | | Merge branch 'dz-button-capitalize' into 'master' Dmitriy Zaporozhets2016-07-091-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update ui_guide.md with button capitalize ruledz-button-capitalizeDmitriy Zaporozhets2016-07-081-1/+2
|/ / / / /
* | | | | Merge branch 'new-snippet-button-permissions' into 'master' Fatih Acet2016-07-085-44/+47
|\ \ \ \ \
| * | | | | Use btn-danger for delete button.Connor Shea2016-07-081-1/+1
| * | | | | Update New Snippet buttons.Connor Shea2016-07-085-43/+46
|/ / / / /
* | | | | Merge branch 'cs-cropper' into 'master' Fatih Acet2016-07-0818-4/+25
|\ \ \ \ \
| * | | | | Fix preferences tests.cs-cropperConnor Shea2016-06-3010-3/+12
| * | | | | Add a helper function for getting the page path from JS.Connor Shea2016-06-292-3/+6
| * | | | | Split Cropper.js from the main JavaScript manifest.Connor Shea2016-06-298-2/+11
* | | | | | Merge branch 'improve-project-limit-field' into 'master' Rémy Coutable2016-07-082-1/+2
|\ \ \ \ \ \
| * | | | | | Add min attribute to project_limit field on user's formAndrey Krivko2016-07-082-1/+2
* | | | | | | Merge branch 'fix_gemfile' into 'master' Rémy Coutable2016-07-081-50/+50
|\ \ \ \ \ \ \
| * | | | | | | set version for gems.bogdanvlviv2016-07-041-15/+15
| * | | | | | | change `require: nil` to `require: false`bogdanvlviv2016-07-041-1/+1
| * | | | | | | replace " to ' in Gemfilebogdanvlviv2016-07-041-36/+36
* | | | | | | | Merge branch 'rubocop/enable-identical-conditional-branches-cop' into 'master' Robert Speicher2016-07-085-30/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove legacy conditional from irker service coderubocop/enable-identical-conditional-branches-copGrzegorz Bizon2016-07-081-8/+0
| * | | | | | | | Enable Style/IdenticalConditionalBranches Rubocop copGrzegorz Bizon2016-07-085-23/+14
* | | | | | | | | Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' Rémy Coutable2016-07-084-9/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-requiredPaco Guzman2016-07-074-9/+8
* | | | | | | | | | Merge branch 'fix-broken-mysql-migration' into 'master' Robert Speicher2016-07-081-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix missing quote_table_nameStan Hu2016-06-291-1/+1
| * | | | | | | | | Fix broken migration in MySQLStan Hu2016-06-291-1/+1
* | | | | | | | | | Merge branch 'edgemaster/gitlab-ce-patch-missing-api-docs'Rémy Coutable2016-07-081-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | API Docs: Add missing project option shared_runners_enabledThomas Wood2016-05-091-0/+3
* | | | | | | | | | | Merge branch 'clarify-github-integration-docs' into 'master' Rémy Coutable2016-07-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix documentation for Github integration authorization callback url.Eric K Idema2016-05-101-1/+1
* | | | | | | | | | | | Merge branch 'fix-changelog-typo' into 'master' Stan Hu2016-07-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix CHANGELOG typo: by_pass -> bypassStan Hu2016-07-011-1/+1
* | | | | | | | | | | | | Merge branch 'yatish27/gitlab-ce-project-commit-range-comment' into 'master' Rémy Coutable2016-07-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix comment for project argument in commit_range.rbYatish Mehta2016-06-201-2/+2
* | | | | | | | | | | | | | Merge branch '1548-average-commits-per-day' into 'master' Rémy Coutable2016-07-082-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Infinity Bug in Commit StatisticsJonas Weber2016-05-202-1/+40
* | | | | | | | | | | | | | | Merge branch 'dont-render-discussion-notes-on-not-html-requests'Douwe Maan2016-07-083-24/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Don't render discussion notes when requesting diff tab through AJAXdont-render-discussion-notes-on-not-html-requestsPaco Guzman2016-07-083-24/+35
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Rémy Coutable2016-07-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed Typo in README.mdPhilipp Kraus2016-06-011-1/+1