Commit Graph
10629 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 445f31c642 Add DELETE to api cors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-11 17:59:37 +02:00
Dmitriy Zaporozhets adf559581c Merge pull request #5759 from bke-drewb/issue-5496
Add cache expiry on avatar creation/removal
2013-12-11 07:43:21 -08:00
Drew Blessing c26d392b1a Expire event cache on avatar creation/removal 2013-12-11 09:30:22 -06:00
Dmitriy Zaporozhets 2934e7a962 Update deploy.sh script with assets commands 2013-12-11 14:34:10 +00:00
Dmitriy Zaporozhets 0cd2ea88b3 Dashboard avatars: No need to load 40px images if we render them in 24px
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-11 16:09:23 +02:00
François Bobot 7b3b63d4d4 [API] add parent_ids to specific commit informations 2013-12-11 14:41:07 +01:00
Dmitriy Zaporozhets 880fef0d92 Merge branch 'rails4' of /home/git/repositories/gitlab/gitlabhq 2013-12-11 09:36:28 +00:00
Dmitriy Zaporozhets 74d19cc4b3 Merge pull request #5819 from jvanbaarsen/rails4
Fixed all the confirm: deprecation warnings
2013-12-10 23:29:12 -08:00
Dmitriy Zaporozhets 3ad6c61241 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-11 09:19:36 +02:00
Dmitriy Zaporozhets c7fd82762a Merge branch 'rails4' of /home/git/repositories/gitlab/gitlabhq 2013-12-11 07:18:40 +00:00
Jeroen van Baarsen bfacf13668 Fixed all the confirm: deprecation warnings 2013-12-10 20:33:21 +01:00
Dmitriy Zaporozhets 72f2be8666 Virtus to version 1.0.1. Bye-bye backports
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 17:07:46 +02:00
Dmitriy Zaporozhets bbd8525d75 Update jasmine gem to work with rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 16:03:24 +02:00
Dmitriy Zaporozhets 5a2ae296fa fix observer specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 15:43:27 +02:00
Dmitriy Zaporozhets 5289190ce8 Add require for Files contexts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 14:15:08 +02:00
Jacob Vosmaer 427e68ecbe Merge pull request #5801 from Rovanion/default-doc
Added example defaults file and appropriate documentation.
2013-12-10 04:09:50 -08:00
Dmitriy Zaporozhets 6708a770de Even more data: confirm
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:48:00 +02:00
Dmitriy Zaporozhets 74d6e492d3 More data: confirm
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:46:50 +02:00
Dmitriy Zaporozhets 7db71b9476 Fix project models specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:41:38 +02:00
Dmitriy Zaporozhets 58eca3118a Fix markdown helper spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:38:31 +02:00
Dmitriy Zaporozhets f088c867a4 Fix signup for rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:35:10 +02:00
Dmitriy Zaporozhets 2ab76ca531 Fix UserProject obserse spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:24:48 +02:00
Dmitriy Zaporozhets d75eb24378 Fix more confirm deprecations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:20:54 +02:00
Dmitriy Zaporozhets 0124ae18c5 Fix User#by_username_or_id for postgres
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:20:35 +02:00
Dmitriy Zaporozhets ed82ab4117 Remove some deprecations and fir project helper specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets 7c91055e4a Fix wiki editing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets 0f5f021527 Fix commits atom feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets f3d5b565d5 fix profile tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:29 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 2293cb1051 Fixed some deprecations
* Model.all is deprecacted, use without .all
* confirm: message is deprecated, needed to be wrapped
  in data block
2013-12-10 12:11:28 +02:00
Dmitriy Zaporozhets 92ce4904b9 Mention assets precompile in installation docs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:28 +02:00
Dmitriy Zaporozhets 5ffce6a65e GitLab app is not threadsafe so better disable allow_concurrency for production env
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:28 +02:00
Dmitriy Zaporozhets 77febe8f1e Fixed mistake and mock warning
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:28 +02:00
Dmitriy Zaporozhets 23c99a98e1 Add rails4 to travis
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets f57a4dd922 Fixed rails 4 deprecation warnings in groups 2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 7c1b8694f5 Upgraded the grape gem 2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 70bb976bc6 Fixed the last deprecation warnings for order and where 2013-12-10 12:11:28 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 2a62aa45cd Fixed some deprecation warnings 2013-12-10 12:11:27 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets e5affcf1ee Fixed default scope deprecation warning 2013-12-10 12:11:27 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 81fc5137ac Fixed the WhiningNill deprecation fix 2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets 475fedc0a7 Make User#accessible_deploy_keys works in rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets a885c68781 Require rspec expectations into spinach
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets 49a26eaece Fix project lookup for git over http + rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets b3c1d0d8df Added allow_blank to model validations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets acbac26a5a Use gems that works with rails 4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets ede272406a Update config/* to rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets f38435b9e7 Use real gems
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets ac5842d970 Migrate application to rails 4 step 1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:26 +02:00
Dmitriy Zaporozhets 8a54fda459 Rails 4 and other gems update
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:26 +02:00
Dmitriy Zaporozhets 16697f6efa Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-10 12:09:18 +02:00
Dmitriy Zaporozhets 6a90378dae Merge branch 'key-generation' of /home/git/repositories/gitlab/gitlabhq 2013-12-10 10:02:57 +00:00