summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rails5-boolean-cast' into 'master'46973-job-failed-71275338Rémy Coutable2018-05-301-2/+3
|\ | | | | | | | | | | | | Fix boolean casting for nil value Closes #46925 See merge request gitlab-org/gitlab-ce!19202
| * Fix boolean casting for nil valueJan Provaznik2018-05-291-2/+3
| | | | | | | | | | | | `nil` value is not included in `ActiveModel::Type::Boolean::FALSE_VALUES` which caused that in Rails 5 the boolean_accessor converted `nil` to `true` instead of `false`.
* | Merge branch 'patch-24' into 'master'Rémy Coutable2018-05-301-1/+3
|\ \ | | | | | | | | | | | | add details on root flag related to no_root_squash See merge request gitlab-org/gitlab-ce!19001
| * | add details on root flag related to no_root_squashBen Bodenmiller2018-05-301-1/+3
|/ /
* | Merge branch 'docs/broken-link-code-review-guidelines' into 'master'Marin Jankovski2018-05-301-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fixed broken link to build team in documentation Closes #46949 See merge request gitlab-org/gitlab-ce!19224
| * | Fixed broken link to build team in documentationEddie Stubbington2018-05-301-1/+1
|/ /
* | Merge branch 'brodock-refactor-hashed-storage-task' into 'master'Douwe Maan2018-05-304-97/+190
|\ \ | | | | | | | | | | | | Extracted auxiliary methods from storage.rake into specific RakeHelper See merge request gitlab-org/gitlab-ce!18962
| * | Specs covering listing all gitlab:storage:* typesbrodock-refactor-hashed-storage-taskGabriel Mazetto2018-05-292-5/+101
| | |
| * | refactor to remove duplicationGabriel Mazetto2018-05-281-14/+12
| | |
| * | assign helper full name to variable to reduce code lengthGabriel Mazetto2018-05-281-10/+19
| | |
| * | Refactor RakeHelper to reduce complexityGabriel Mazetto2018-05-281-26/+18
| | |
| * | Remove useless extra lines from `storage.md` inside code blockGabriel Mazetto2018-05-281-7/+0
| | |
| * | Extracted auxiliary methods from storage.rake into specific RakeHelperGabriel Mazetto2018-05-282-86/+91
| | |
* | | Merge branch 'fix/bitbucket_import_anonymous' into 'master'Douwe Maan2018-05-304-1/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Import bitbucket issues that are reported by an anonymous user Closes #44381 See merge request gitlab-org/gitlab-ce!18199
| * | | Import bitbucket issues that are reported by an anonymous userBart Libert2018-05-244-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For these kind of issues, the "reporter" field is present but zero. In such a case, "fetch" will not return the default value, but it will return nil. Hence, importing fails, because the "username" field of nil is referenced Fixes issue #44381
* | | | Merge branch 'sh-fix-submit-not-clearing-local-storage' into 'master'Filipa Lacerda2018-05-304-2/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix local storage not being cleared after creating a new issue Closes #37162 See merge request gitlab-org/gitlab-ce!19226
| * | | | Add a regression test for clearing local storage upon issue creationStan Hu2018-05-291-0/+14
| | | | |
| * | | | Fix local storage not being cleared after creating a new issueStan Hu2018-05-293-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating a new issue will always result in a 302 redirect to the newly-created issue. This reverts the change introduced in https://gitlab.com/gitlab-org/gitlab-ce/commit/7684217d6806408cd338260119364419260d1720 to handle the case where a user is in the middle of creating a new form and redirected to accepting the terms of service. Closes #37162
* | | | | Merge branch 'patch-25' into 'master'Rémy Coutable2018-05-301-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add CI as option in place of custom hooks See merge request gitlab-org/gitlab-ce!19023
| * | | | | add CI as option in place of custom hooksBen Bodenmiller2018-05-301-1/+2
|/ / / / /
* | | | | Merge branch 'mattermost-api-v4' into 'master'Sean McGivern2018-05-3010-46/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Mattermost integration to use Mattermost API v4 Closes #41631 See merge request gitlab-org/gitlab-ce!19043
| * | | | | Updated help text for team list for Mattermost slash commandsHarrison Healey2018-05-293-5/+5
| | | | | |
| * | | | | Updated Mattermost integration to use Mattermost API v4Harrison Healey2018-05-288-42/+49
| | | | | |
* | | | | | Merge branch 'render_super' into 'master'Rémy Coutable2018-05-303-16/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Add render_ce to render CE partial in EE partial See merge request gitlab-org/gitlab-ce!19150
| * | | | | | Add document around `render_ce`render_superLin Jen-Shin2018-05-291-12/+38
| | | | | | |
| * | | | | | Unify app/views/shared/issuable/form/_title.html.hamlLin Jen-Shin2018-05-282-4/+5
| | | | | | |
* | | | | | | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-3041-64/+840
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Squash and merge in GitLab Core (CE)" Closes #34591 See merge request gitlab-org/gitlab-ce!18956
| * | | | | | | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-2941-64/+840
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '46844-update-awesome_print-to-1-8-0' into 'master'Dmitriy Zaporozhets2018-05-303-3/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update awesome_print to 1.8.0 Closes #46844 See merge request gitlab-org/gitlab-ce!19163
| * | | | | | | Update awesome_print to 1.8.0Takuya Noguchi2018-05-293-3/+8
| | | | | | | |
* | | | | | | | Merge branch 'bootstrap-pull-float' into 'master'Annabel Gray2018-05-308-15/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert remaining pull-* to float-* Closes #46934 See merge request gitlab-org/gitlab-ce!19225
| * | | | | | | | Convert remaining pull-* to float-*Clement Ho2018-05-298-15/+15
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-snippet-row' into 'master'Annabel Gray2018-05-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix snippet row Closes #46820 See merge request gitlab-org/gitlab-ce!19218
| * | | | | | | | | Fix snippet rowClement Ho2018-05-291-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch '46877-bootstrap-4-lists' into 'master'Clement Ho2018-05-3021-33/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""well-list" is removed from Bootstrap 4" Closes #46877 See merge request gitlab-org/gitlab-ce!19207
| * | | | | | | | | Remove duplicate classesAnnabel Dunstone Gray2018-05-291-2/+2
| | | | | | | | | |
| * | | | | | | | | Replace well-list with content-list and hover-listAnnabel Dunstone Gray2018-05-2922-34/+34
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bootstrap-emails-verify-badge' into 'master'Annabel Gray2018-05-303-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix email verification badge Closes #46818 See merge request gitlab-org/gitlab-ce!19217
| * | | | | | | | | Fix email verification badgeClement Ho2018-05-293-3/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-bump-rugged-to-0.27.1' into 'master'Robert Speicher2018-05-291-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bump rugged to 0.27.1 for security fixes See merge request gitlab-org/gitlab-ce!19222
| * | | | | | | | Bump rugged to 0.27.1 for security fixesStan Hu2018-05-291-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'sh-ruby-cache-key-debian-stretch' into 'master'Robert Speicher2018-05-291-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade cache key to be clear that Debian Stretch is being used See merge request gitlab-org/gitlab-ce!19214
| * | | | | | | | Upgrade cache key to be clear that Debian Stretch is being usedStan Hu2018-05-291-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes build errors caused by a stale cache since the new Docker image upgraded from Debian Jessie to Stretch, which shipped an updated version of OpenSSL.
* | | | | | | | Merge branch 'bootstrap-ide-new-file-modal' into 'master'Annabel Gray2018-05-292-18/+12
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix web IDE new entry modal form alignment Closes #46933 See merge request gitlab-org/gitlab-ce!19210
| * | | | | | | Fix web IDE new entry modal form alignmentClement Ho2018-05-292-18/+12
| | | | | | | |
* | | | | | | | Merge branch '6045-extract-ee-specific-specs-lines' into 'master'Robert Speicher2018-05-2912-53/+110
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Resolve "Extract EE specific files/lines for some controller specs" Closes #6045 See merge request gitlab-org/gitlab-ce!19089
| * | | | | | | | Try to fetch the CE branch in EE because sometimes it has the same name6045-extract-ee-specific-specs-linesRémy Coutable2018-05-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Reduce CE/EE diff in ↵Rémy Coutable2018-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/controllers/projects/project_members_controller_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Reduce CE/EE diff in spec/controllers/projects/issues_controller_spec.rbRémy Coutable2018-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Reduce CE/EE diff in spec/controllers/projects/imports_controller_spec.rbRémy Coutable2018-05-241-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status