summaryrefslogtreecommitdiff
path: root/changelogs
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog entry55266-fix-incorrect-due-date-parsingKushal Pandya2018-12-271-0/+5
|
* Merge branch 'gt-reorder-group-sidebar-menu-items' into 'master'Sean McGivern2018-12-271-0/+5
|\ | | | | | | | | | | | | Reorder sidebar menu item for group clusters Closes #55536 See merge request gitlab-org/gitlab-ce!24001
| * Reorder sidebar menu item for group clustersGeorge Tsiolis2018-12-221-0/+5
| |
* | Merge branch ↵Stan Hu2018-12-271-0/+5
|\ \ | | | | | | | | | | | | | | | | | | '54953-error-500-viewing-merge-request-due-to-nil-commit_email_hostname' into 'master' Return an ApplicationSetting in CurrentSettings See merge request gitlab-org/gitlab-ce!23766
| * \ Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2018-12-26276-1263/+126
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54953-error-500-viewing-merge-request-due-to-nil-commit_email_hostname * upstream/master: (115 commits) [CE] Speed up login page usage Add new line and comments Fix the seeder 24_forks.rb cannot find public project Milestones on community contribution issues Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rb Fix and move specs into admin_disables_git_access_protocol_spec.rb Fix HTTP/SSH clone panel for mobile Add spec for HTTP/SSH clone panel Fix missing Git clone button when protocol restriction setting enabled Fix deprecation: Using positional arguments in integration tests Extend override check to also check arity Update tm cli version Bump Gitaly version to v1.12.0 Add @dbalexandre to CODEOWNERS Update verbiage for clarity Change group-cluster beta to regular note Change alpha states to use note instead of warning Update registry section. Update serverless.yaml formatting Clarify obtaining application URL Add @godfat to CODEOWNERS ...
| * | | Return an ApplicationSetting in CurrentSettingsRémy Coutable2018-12-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the use of fake_application_settings with `::ApplicationSetting.build`_from_defaults. The reason is that `fake_application_settings` doesn't have the custom accessors that `ApplicationSetting` has, e.g. `#commit_email_hostname`, thus this can lead to unexpected `nil` values which comes from the database column instead of `.default_commit_email_hostname` returned by `ApplicationSetting#commit_email_hostname`. Using `::ApplicationSetting.build_from_defaults` should be safe as it doesn't try to `INSERT` a DB record, in contrary to `::ApplicationSetting.create_from_defaults` which we used to use, and which created issues that the introduction of `fake_application_settings` tried to resolve (575dced5). Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'sh-fix-clone-geo-dropdown' into 'master'docs-test-2docs-test-1Stan Hu2018-12-261-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix clone dropdown parent inheritance issues in HAML See merge request gitlab-org/gitlab-ce!24029
| * | | | Add changelog entryKushal Pandya2018-12-261-0/+5
| | | | |
* | | | | Add word-break to issue title to fix edit button disspearingRubén Moya2018-12-261-0/+4
| |_|/ / |/| | |
* | | | Merge branch '42125-extend-override-check-to-also-check-arity' into 'master'Lin Jen-Shin2018-12-261-0/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Extend `override` check to also check arity" Closes #42125 See merge request gitlab-org/gitlab-ce!23498
| * | | Extend override check to also check arity42125-extend-override-check-to-also-check-arityJacopo2018-12-221-0/+5
| | | | | | | | | | | | | | | | | | | | Override now cares about parents method arity: if parents arity doesn't match raises an error.
* | | | Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rbJacob Wolen2018-12-241-0/+5
| | | |
* | | | Merge branch 'spec-positional-arguments' into 'master'Lin Jen-Shin2018-12-241-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix deprecation: Using positional arguments in integration tests See merge request gitlab-org/gitlab-ce!24009
| * | | | Fix deprecation: Using positional arguments in integration testsJasper Maes2018-12-221-0/+5
| | | | |
* | | | | Fix missing Git clone button when protocol restriction setting enabledStan Hu2018-12-231-0/+5
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Git clones are restricted to either HTTP or SSH-only in the application settings, the clone button would not show. The refactoring in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22196 broke this. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55676
* | | | Merge branch '44984-use-serializer-for-issuable-sidebar' into 'master'Mike Greiling2018-12-211-0/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Create a serializer to render issuables sidebar" Closes #44984 See merge request gitlab-org/gitlab-ce!23379
| * | | Add changelog entryHeinrich Lee Yu2018-12-191-0/+5
| | | |
* | | | Merge branch 'revert-62d250ff' into 'master'Sean McGivern2018-12-211-5/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'winh-discussion-header-commented' into 'master'" Closes #55641 See merge request gitlab-org/gitlab-ce!23993
| * | | | Revert "Merge branch 'winh-discussion-header-commented' into 'master'"Winnie Hellmann2018-12-211-5/+0
| | | | | | | | | | | | | | | This reverts merge request !23622
* | | | | Merge branch 'support-gitaly-tls' into 'master'Lin Jen-Shin2018-12-211-0/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Support tls communication in gitaly See merge request gitlab-org/gitlab-ce!22602
| * | | | Followups on reviewAhmad Hassan2018-12-191-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-12-1732-1/+156
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-12-11454-1169/+1105
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-11-15129-15/+631
| |\ \ \ \ \ \
| * | | | | | | Add changelog entryAhmad Hassan2018-10-311-0/+5
| | | | | | | |
* | | | | | | | Update CHANGELOG.md for 11.6.0GitLab Release Tools Bot2018-12-21252-1272/+0
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'markdown-toolbar-btn-fix' into 'master'Filipa Lacerda2018-12-211-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the markdown toolbar buttons Closes #55618 See merge request gitlab-org/gitlab-ce!23979
| * | | | | | | | Fixes the markdown toolbar buttonsPhil Hughes2018-12-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55618
* | | | | | | | | Merge branch 'feature/option-to-make-variables-protected' into 'master'Grzegorz Bizon2018-12-211-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Option to make variables protected by default Closes #51822 See merge request gitlab-org/gitlab-ce!22744
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 'feature/option-to-make-variables-protected'Grzegorz Bizon2018-12-20200-45/+967
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | Conflicts: db/schema.rb
| * | | | | | | | | add changelogAlexis Reigel2018-11-291-0/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch ↵Filipa Lacerda2018-12-211-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '55293-split-bio-into-individual-line-in-extended-user-tooltips' into 'master' Resolve "Split bio into individual line in extended user tooltips" Closes #55293 See merge request gitlab-org/gitlab-ce!23940
| * | | | | | | | | | Split bio into individual line in extended user tooltipsMartin Wortschack2018-12-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove leading 'at' in organzation info - Update karma tests
* | | | | | | | | | | Merge branch '53933-include-dates-in-milestone-change-email' into 'master'Lin Jen-Shin2018-12-211-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add date range to milestone changed emails Closes #53933 See merge request gitlab-org/gitlab-ce!23762
| * | | | | | | | | | | Add changelog entryHeinrich Lee Yu2018-12-211-0/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'specs-positional-arguments' into 'master'Lin Jen-Shin2018-12-211-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5: convert specs in javascripts/ and support/ to new spec syntax See merge request gitlab-org/gitlab-ce!23947
| * | | | | | | | | | | convert specs in javascripts/ and support/ to new syntaxJasper Maes2018-12-211-0/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2018-12-211-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'security-import-symlink' into 'master'John Jarvis2018-12-211-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Persistent Symlink in Project Import See merge request gitlab/gitlabhq!2673
| | * | | | | | | | | | | Fix persistent symlink in project importJames Lopez2018-12-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix permissions after untar is done - Refactor command line util
* | | | | | | | | | | | | Merge branch 'dm-note-email-image-diff-discussion' into 'master'Sean McGivern2018-12-211-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix notification email for image diff notes See merge request gitlab-org/gitlab-ce!23958
| * | | | | | | | | | | | | Add changelog entryDouwe Maan2018-12-201-0/+5
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'winh-merge-request-commit-context' into 'master'Kushal Pandya2018-12-211-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display commit ID for discussions made on merge request commits Closes #53953 See merge request gitlab-org/gitlab-ce!23837
| * | | | | | | | | | | | MR commits display commit ID for discussionsFatih Acet2018-12-211-0/+5
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where merge request comments made in the context of a specific commit no longer specify which commit they were created on
* | | | | | | | | | | | Merge branch 'winh-discussion-header-commented' into 'master'Mike Greiling2018-12-201-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display "commented" only for commit discussions on merge requests Closes #53950 and #53681 See merge request gitlab-org/gitlab-ce!23622
| * | | | | | | | | | | | Display "commented" only for commit discussions on merge requestsWinnie Hellmann2018-12-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add commit prop to NoteableNote component and pass it from NoteableDiscussion
* | | | | | | | | | | | | Merge branch '51668-fix-line-numbers' into 'master'Mike Greiling2018-12-201-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix line-height of line numbers Closes #55278 and #51668 See merge request gitlab-org/gitlab-ce!23775
| * | | | | | | | | | | | Adjust line height of blame view line numbersAnnabel Dunstone Gray2018-12-131-0/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '52620-fix-loader-animation-alignment' into 'master'Annabel Dunstone Gray2018-12-201-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "build-loader-animation dots misaligned" Closes #52620 See merge request gitlab-org/gitlab-ce!23959
| * | | | | | | | | | | | | Aligns build loader animation with the job logFilipa Lacerda2018-12-201-0/+5
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
View Lorry Controller Status