Jonne Haß
dae69f9558
Merge pull request #4662 from Raven24/update_underscore-backbone
...
update backbone.js and underscore.js
2014-01-17 03:24:46 -08:00
Jonne Haß
3b7a8992e4
Merge pull request #4698 from goobertron/remove_alpha_refs
...
Remove alpha refs from devise.en.yml
2014-01-16 15:32:39 -08:00
Florian Staudacher
1924c40d38
replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem
...
- updates underscore to 1.5.2 and backbone to 1.1.0
backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
models
other changes:
- fix some events triggering multiple times in connection with deleting
a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
* no longer test the backbone router as part of our code
* jasmine factory already returns model instances, no need to wrap
that again
2014-01-16 23:23:30 +01:00
goobertron
0b0d0000fe
Remove alpha references to invites and buggy software
2014-01-16 18:51:39 +00:00
Dennis Schubert
6fc5ccb9f9
Merge pull request #4511 from MrZYX/bump_devise
...
update devise to 3.2
2014-01-15 13:17:48 -08:00
Jonne Haß
d97fd8089b
Merge pull request #4688 from ivanzotov/develop
...
Fix after_create to after_commit
2014-01-15 11:47:23 -08:00
Jonne Haß
15b1dae362
update devise to 3.2
2014-01-15 12:59:59 +01:00
Fabian Rodriguez
23c24e170d
Merge pull request #4635 from diaspora/update_gems
...
Update gems
2014-01-15 03:15:53 -08:00
Ivan Zotov
a4ce6e267a
Fix after_create to after_commit
2014-01-14 22:35:29 +04:00
Jonne Haß
80acf6b057
Merge pull request #4692 from svbergerem/header-fix-badge-background
...
Remove background from badges in header
2014-01-14 06:03:25 -08:00
Steffen van Bergerem
580068ed7c
Remove background from badges in header
2014-01-14 15:00:36 +01:00
Jonne Haß
88e0580982
Merge pull request #4682 from goobertron/NSFW_profile_text
...
Change NSFW explanation on profile settings page
2014-01-13 14:13:35 -08:00
goobertron
29a98ddc29
Remove duplicate test steps
2014-01-13 18:47:47 +00:00
goobertron
706b11b14d
Now with passing Cucumber tests
2014-01-13 18:14:43 +00:00
Jonne Haß
cb048a2785
bump pg
2014-01-13 12:26:57 +01:00
Jonne Haß
108a4776d2
bump sass
2014-01-13 12:26:23 +01:00
Jonne Haß
e523583d61
bump orm_adapter
2014-01-13 12:26:23 +01:00
Jonne Haß
073f9db9a1
bump kaminari
2014-01-13 12:26:23 +01:00
Jonne Haß
25988ff04c
bump webmock
2014-01-13 12:26:23 +01:00
Jonne Haß
d3221b396a
bump chunky_png
2014-01-13 12:26:23 +01:00
Jonne Haß
bf1d92cd50
bump bcrypt-ruby
2014-01-13 12:26:22 +01:00
Jonne Haß
f107a3145d
bump will_paginate
2014-01-13 12:26:22 +01:00
Jonne Haß
84c4e68a73
bump rack-rewrite
2014-01-13 12:26:22 +01:00
Jonne Haß
e712bec498
bump json
2014-01-13 12:26:21 +01:00
Jonne Haß
196bb5e4c1
bump i18n-inflector-rails
2014-01-13 12:25:39 +01:00
Jonne Haß
f7759f2177
bump haml
2014-01-13 12:25:39 +01:00
Jonne Haß
92a153edaf
bump guard-rspec
2014-01-13 12:25:39 +01:00
Jonne Haß
d0aa4cee61
bump faraday
2014-01-13 12:25:39 +01:00
Jonne Haß
88cb24fd32
bump acts_as_api
2014-01-13 12:25:39 +01:00
Jonne Haß
c11ddaa770
remove not_to raise_error deprecations
2014-01-13 12:25:38 +01:00
Jonne Haß
32b9caa08c
replace stub and mock deprecations with doubles
2014-01-13 12:25:38 +01:00
Jonne Haß
b5854d3172
remove outer (deprecated) describe blocks from shared examples
2014-01-13 12:25:38 +01:00
Jonne Haß
a0bbd899de
replace rspec_reset with obscure reset line stolen from rspec-mocks
2014-01-13 12:25:38 +01:00
Jonne Haß
7bb055932a
replace =~ array matching with match_array
2014-01-13 12:25:37 +01:00
Jonne Haß
525cd4cc02
fix stream helper spec for new rspec
2014-01-13 12:25:37 +01:00
Jonne Haß
01ecd9d054
do not overwrite rspec methods (receive)
2014-01-13 12:25:37 +01:00
Jonne Haß
df0bff6537
replace stub! with stub
2014-01-13 12:25:37 +01:00
Jonne Haß
cabc6a5c92
bump rails_autolink
2014-01-13 12:25:36 +01:00
Jonne Haß
97d744d6da
bump test_after_commit
2014-01-13 12:25:36 +01:00
Jonne Haß
d6878631bf
bump capybara
2014-01-13 12:25:36 +01:00
Jonne Haß
b1375fd3f0
bump rack-google-analytics
2014-01-13 12:25:36 +01:00
Jonne Haß
801d4d4617
bump mini_magick
2014-01-13 12:25:35 +01:00
Jonne Haß
b771287893
bump omniauth-twitter
2014-01-13 12:25:35 +01:00
Jonne Haß
b7424b52e2
bump omniauth-facebook
2014-01-13 12:25:32 +01:00
Jonne Haß
56b62b0fa4
bump rb-inotify
2014-01-13 12:23:08 +01:00
Jonne Haß
8591488ad9
bump rb-fsevent
2014-01-13 12:23:08 +01:00
Jonne Haß
ccadcee444
bump spork
2014-01-13 12:23:07 +01:00
Jonne Haß
630a1e5980
bump guard-cucumber
2014-01-13 12:23:07 +01:00
Jonne Haß
52e3da9866
bump fuubar
2014-01-13 12:23:07 +01:00
Jonne Haß
8001a2da66
bump rspec
2014-01-13 12:23:07 +01:00
