diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-09-25 15:42:34 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-09-25 15:42:34 +0800 |
| commit | 239332eed3fa870fd41be83864882c0f389840d8 (patch) | |
| tree | a81aba7617f391f9cb4a67339faa9de67b4426d3 /features/steps/shared/note.rb | |
| parent | 961b0849e5098dae74050f6c49ebf3011ce072b7 (diff) | |
| parent | 7da72a0de296e430378c7eb85fc486a01f3163bd (diff) | |
| download | gitlab-ce-239332eed3fa870fd41be83864882c0f389840d8.tar.gz | |
Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules
* upstream/master: (168 commits)
Update CHANGELOG.md for 10.0.1
Remove Grit settings from default settings
Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration
Workaround for #38259
Workaround for n+1 in Projects::TreeController#show
Removed old icons from project page
Make branches page translatable
fix typo in icons section
Don't show it if there's no project.
Update CHANGELOG.md for 10.0.0
Inform user that current shared projects will remain shared
Allow the git circuit breaker to correctly handle missing repository storages
Reserve refs/replace cos `git-replace` is using it
Resolve "Better SVG Usage in the Frontend"
Replace the 'project/service.feature' spinach test with an rspec analog
Replace the 'project/shortcuts.feature' spinach test with an rspec analog
Removed two legacy config options
Fix rendering double note issue.
IssueNotes: Switch back to Write pane when note cancel or submit.
Upgrade Nokogiri because of CVE-2017-9050
...
Diffstat (limited to 'features/steps/shared/note.rb')
0 files changed, 0 insertions, 0 deletions