summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add review apps supportenable-review-appsKamil Trzcinski2017-01-272-1/+159
* Merge branch 'fix-ci-requests-concurrency' into 'master' Grzegorz Bizon2017-01-255-12/+38
|\
| * Return struct instead of multiple valuesKamil Trzcinski2017-01-253-8/+10
| * Add 409 conflict testsfix-ci-requests-concurrencyKamil Trzcinski2017-01-251-0/+14
| * Add CHANGELOGKamil Trzcinski2017-01-251-0/+3
| * Fix specsKamil Trzcinski2017-01-252-1/+2
| * Fix picking CI buildsKamil Trzcinski2017-01-252-11/+17
* | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon2017-01-2510-48/+141
|\ \ | |/
| * Remove unneeded code and fix offensesbackport-ee-changes-for-build-minutesKamil Trzcinski2017-01-254-73/+11
| * Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui...Kamil Trzcinski2017-01-24345-1408/+3304
| |\
| * | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_...Kamil Trzcinski2017-01-2011-48/+203
* | | Merge branch '27014-fix-pipeline-tooltip-wrapping' into 'master' Annabel Dunstone Gray2017-01-252-0/+8
|\ \ \
| * | | Fix mini-pipeline stage tooltip text wrapping27014-fix-pipeline-tooltip-wrappingEric Eastwood2017-01-242-0/+8
* | | | Merge branch 'small-screen-fullscreen-button' into 'master' Clement Ho2017-01-252-1/+5
|\ \ \ \
| * | | | Display fullscreen button on small screens (!5302)winniehell2017-01-252-1/+5
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqAlejandro Rodríguez2017-01-251-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update CHANGELOG.md for 8.16.1Robert Speicher2017-01-231-0/+8
* | | | | Merge branch 'backport-ee-1067-deal-with-repo-size-limit-as-byte' into 'master' Yorick Peterse2017-01-254-12/+34
|\ \ \ \ \
| * | | | | Extract set_project_name_from_path methodbackport-ee-1067-deal-with-repo-size-limit-as-byteOswaldo Ferreira2017-01-231-11/+15
| * | | | | EE backport for new application settings serviceOswaldo Ferreira2017-01-233-1/+19
* | | | | | Merge branch 'fix/cycle-analytics-spec-failure' into 'master' Rémy Coutable2017-01-251-1/+6
|\ \ \ \ \ \
| * | | | | | Fix spec failure due to timestamp ordering issue in mySQLJames Lopez2017-01-251-1/+6
* | | | | | | Merge branch 'dz-fix-group-canonical-route' into 'master' Dmitriy Zaporozhets2017-01-252-4/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix 500 error for Group#web_url method if nested groupdz-fix-group-canonical-routeDmitriy Zaporozhets2017-01-242-4/+8
* | | | | | | | Merge branch 'dz-nested-groups-access-improvements' into 'master' Dmitriy Zaporozhets2017-01-2511-15/+118
|\ \ \ \ \ \ \ \
| * | | | | | | | Add User#nested_groups and User#nested_projects methodsDmitriy Zaporozhets2017-01-257-4/+73
| * | | | | | | | Refactor Namespace code related to nested groupsDmitriy Zaporozhets2017-01-136-13/+47
* | | | | | | | | Merge branch 'patch-12' into 'master' Sean McGivern2017-01-251-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update enviroments.md - example CURL requests had a typo in the URLMarc van Gend2017-01-241-2/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch '22072-enable-haml-linters-phase-2' into 'master' Sean McGivern2017-01-2571-108/+108
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | HAMLLint: Fix `UnnecessaryInterpolation` and `UnnecessaryStringOutput` offenc...22072-enable-haml-linters-phase-2Kushal Pandya2017-01-242-3/+3
| * | | | | | | | | HAMLLint: Enable `MultilinePipe` ruleKushal Pandya2017-01-241-1/+1
| * | | | | | | | | HAMLLint: Fix `RubyComments` offencesKushal Pandya2017-01-246-13/+13
| * | | | | | | | | HAMLLint: Enable `RubyComments` ruleKushal Pandya2017-01-241-1/+1
| * | | | | | | | | HAMLLint: Fix `UnnecessaryStringOutput` offencesKushal Pandya2017-01-2425-31/+31
| * | | | | | | | | HAMLLint: Enable `UnnecessaryStringOutput` ruleKushal Pandya2017-01-241-1/+1
| * | | | | | | | | HAMLLint: Fix `UnnecessaryInterpolation` offencesKushal Pandya2017-01-2442-60/+60
| * | | | | | | | | HAMLLint: Enable `UnnecessaryInterpolation` ruleKushal Pandya2017-01-241-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'issue-fiter-test-failure' into 'master' Rémy Coutable2017-01-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed error with filter keyboard testsPhil Hughes2017-01-251-1/+1
* | | | | | | | | | Merge branch 'tc-only-mr-button-if-allowed' into 'master' Sean McGivern2017-01-253-1/+113
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | `can?` already includes the `feature_available?` checktc-only-mr-button-if-allowedToon Claes2017-01-251-1/+0
| * | | | | | | | | | Test there is no Merge Request button when MRs are disabledToon Claes2017-01-251-0/+14
| * | | | | | | | | | Ensure the correct Merge Request button is foundToon Claes2017-01-251-6/+14
| * | | | | | | | | | Deduplicate tests for Merge Request buttonsToon Claes2017-01-234-186/+86
| * | | | | | | | | | Only show Merge Request button when user can create a MRToon Claes2017-01-205-0/+191
* | | | | | | | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-2523-36/+347
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | address commentsJarka Kadlecova2017-01-2516-58/+141
| * | | | | | | | | | make mentions working when project not specifiedJarka Kadlecova2017-01-189-10/+54
| * | | | | | | | | | Support notes without projectJarka Kadlecova2017-01-1815-20/+204