Skip to content

Commit 9200265

Browse files
seurosseuros
committed
Merge branch 'r4'
Conflicts: .gitignore .ruby-version .travis.yml Gemfile Gemfile.lock app/assets/stylesheets/coderwall.scss app/models/user.rb app/views/home/index.html.haml
2 parents c2f0762 + 6784443 commit 9200265

File tree

146 files changed

+1507
-2859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+1507
-2859
lines changed

‎.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ REVIEWERS="['Administrator']"
1313
NOTIFIER_ADMIN_EMAILS="['notifier_admin@example.com']"
1414
SUPPORT_EMAIL=support@example.com
1515
SESSION_SECRET=session_secret
16+
APP_DOMAIN=www.coderwall.com
1617

1718
######### Development Settings #########
1819

‎.gitignore

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,13 @@
11

22
# Ignore application configuration
3-
*.dat
4-
*.gem
5-
*.rbc
6-
*/.DS_Store
7-
.DS_Store
8-
.bundle
9-
.config
10-
*.env
3+
.env
114
.idea
12-
.sass-cache
135
.vagrant
14-
.rspec-local
15-
.yardoc
16-
/.bundle
17-
config/application.yml
18-
config/database.yml
19-
/db/*.sqlite3
20-
/db/*.sqlite3-journal
216
/log/*.log
227
/tmp
23-
InstalledFiles
24-
Procfile.bashir
25-
Procfile.test
26-
TODO
27-
_yardoc
288
config/secret.yml
299
coverage
30-
coverage/
31-
db/*.sqlite3
32-
doc/
33-
latest.dump
34-
lib/bundler/man
3510
log/*.log
36-
logfile
37-
nlp.rb
38-
pkg
39-
public/assets/
40-
public/images/top/
41-
rdoc
42-
script/env
43-
spec/render
44-
spec/reports
45-
stdout
46-
test/tmp
47-
test/version_tmp
4811
tmp
4912
vagrant/cache
5013
vagrant/coderwall-box/output-virtualbox-iso/

‎.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.6
1+
2.2.2

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: ruby
22
rvm:
3-
- 2.1.6
3+
- 2.2.2
44
cache: bundler
55
sudo: false
66
bundler_args: "--without development production"

‎Gemfile

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
ruby '2.1.6'
1+
ruby '2.2.2'
22

33
source 'https://rubygems.org' do
4-
gem 'rails', '~> 3.2'
4+
gem 'rails', '~> 4.2'
55

66
gem 'sass'
77
gem 'coffee-rails'
@@ -56,7 +56,7 @@ source 'https://rubygems.org' do
5656
gem 'chronic'
5757

5858
# Redis
59-
gem 'redis-rails', '3.2.4'
59+
gem 'redis-rails'
6060

6161

6262
gem 'sidekiq'
@@ -88,17 +88,14 @@ source 'https://rubygems.org' do
8888
gem 'faraday', '~> 0.8.1'
8989
gem 'metamagic'
9090

91-
gem "mail_view", "~> 2.0.4"
92-
9391
# ----------------
9492

95-
96-
gem 'acts_as_commentable', '2.0.1'
97-
gem 'acts_as_follower', '0.1.1'
93+
gem 'acts_as_commentable'
94+
gem 'acts_as_follower'
9895
gem 'color'
9996
gem 'createsend'
10097
gem 'fog'
101-
gem 'friendly_id', '4.0.10.1'
98+
gem 'friendly_id'
10299
gem 'geocoder'
103100
gem 'hashie'
104101
gem 'linkedin'
@@ -113,6 +110,7 @@ source 'https://rubygems.org' do
113110
gem 'ruby-progressbar'
114111
gem 'sanitize'
115112
gem 'simple_form'
113+
gem 'responders', '~> 2.0'
116114
gem 'sitemap_generator'
117115
gem 'tweet-button'
118116
gem 'local_time'
@@ -122,8 +120,6 @@ source 'https://rubygems.org' do
122120

123121
# DROP BEFORE RAILS 4
124122
gem 'compass-rails'
125-
gem 'strong_parameters'
126-
gem 'postgres_ext'
127123
# ElasticSearch client
128124
gem 'tire'
129125
# /DROP BEFORE RAILS 4

0 commit comments

Comments
 (0)