diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-22 18:50:28 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-22 18:50:28 +0000 |
| commit | a7f52b6cc25991bffa30eefa7d8bd6be138cffec (patch) | |
| tree | 0b2604f83828347b08ed1d67f6c5cc4b0e08ffbf /lib/api/files.rb | |
| parent | 3afd91f28d1e94bcc9eb6e54d1163f2cfaaaf70c (diff) | |
| parent | 5a8d8b6f20ab795fddcf651a7298f61696c7e2ab (diff) | |
| download | gitlab-ce-a7f52b6cc25991bffa30eefa7d8bd6be138cffec.tar.gz | |
Merge branch 'rails-4.1.9' into 'master'
Upgrade to Rails 4.1.9
Upgrade the Rails gem to 4.1.9. Rails behavior changed in version 4.1.2, requiring that we avoid using slashes in arguments to path helpers. This MR changes routing to use nested resources for that reason.
TODO:
* [x] Make Spinach tests green
* [x] Make it mergeable
cc @sytse @dzaporozhets
See merge request !1494
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions