Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wth update to 5.1.2 #983

Merged
merged 119 commits into from
Jul 14, 2017
Merged

Wth update to 5.1.2 #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
4bd7376
updated gems, lots of failures
Jun 14, 2017
f4cb271
fixed additional details specs
Jun 14, 2017
daa1bd4
fixed admin identity spec
Jun 15, 2017
1a24c93
fixed admin controller specs
Jun 15, 2017
7a42274
fixing arm specs...
Jun 15, 2017
ce16c21
fixed arm specs
Jun 15, 2017
4422e5e
fixed additional details specs
Jun 15, 2017
3137ab7
fixed associated users controller specs
Jun 15, 2017
795c226
fixed catalog manager controller specs
Jun 15, 2017
681ee00
fixed catalogs specs
Jun 15, 2017
6a64a80
fixed contact forms specs
Jun 15, 2017
c053411
finished dashboard/approvals
Jun 15, 2017
7ebc8b9
finished dashboard arms
Jun 15, 2017
5b40568
fixed associated users
Jun 15, 2017
f3dd603
jtm finished some controller specs
BigChiefSmidgeums Jun 15, 2017
4b5369c
More spec work
BigChiefSmidgeums Jun 15, 2017
2452ce5
Merge conflicts
BigChiefSmidgeums Jun 15, 2017
cce2017
Skipped a spec
BigChiefSmidgeums Jun 15, 2017
9cfbcb5
updated gems, lots of failures
Jun 14, 2017
eb6091e
fixed additional details specs
Jun 14, 2017
765706a
fixed admin identity spec
Jun 15, 2017
844e68e
fixed admin controller specs
Jun 15, 2017
74bdecd
fixing arm specs...
Jun 15, 2017
5f0f713
fixed arm specs
Jun 15, 2017
e262819
fixed additional details specs
Jun 15, 2017
76e4488
fixed associated users controller specs
Jun 15, 2017
48acc07
fixed catalog manager controller specs
Jun 15, 2017
07f6a4e
fixed catalogs specs
Jun 15, 2017
8061cdc
fixed contact forms specs
Jun 15, 2017
e134b47
finished dashboard/approvals
Jun 15, 2017
15ae139
finished dashboard arms
Jun 15, 2017
b6b8a02
fixed associated users
Jun 15, 2017
1918b0b
jtm finished some controller specs
BigChiefSmidgeums Jun 15, 2017
6febafb
More spec work
BigChiefSmidgeums Jun 15, 2017
f5597fc
fixed dashboard/documents
Jun 15, 2017
c5057de
jtm merge conflicts
BigChiefSmidgeums Jun 15, 2017
db385e0
jtm some api spec fixin's
BigChiefSmidgeums Jun 15, 2017
004e3c5
jtm feature specs
BigChiefSmidgeums Jun 15, 2017
638757b
jtm fixed protocol filter delete error
BigChiefSmidgeums Jun 15, 2017
91c12fa
back to two travis jobs
Stuart-Johnson Jun 15, 2017
02d5086
fixed additional details specs
Jun 14, 2017
10f933a
fixed additional details specs
Jun 15, 2017
7a2f9dd
fixed associated users
Jun 15, 2017
2bbaadf
jtm finished some controller specs
BigChiefSmidgeums Jun 15, 2017
52242cc
More spec work
BigChiefSmidgeums Jun 15, 2017
eb9c5a6
fixed catalog manager specs
Jun 15, 2017
94ad217
fixed specs
Jun 15, 2017
2933706
syntax error
Jun 15, 2017
63f18d9
jtm left a binding.pry
BigChiefSmidgeums Jun 15, 2017
deef3b4
fixed features
Jun 16, 2017
1266539
jtm spec fixing
BigChiefSmidgeums Jun 16, 2017
9544003
jtm merge conflicts
BigChiefSmidgeums Jun 16, 2017
12c372a
jtm finished up lib and job specs
BigChiefSmidgeums Jun 16, 2017
674097e
updated gems, lots of failures
Jun 14, 2017
b63e47f
fixed additional details specs
Jun 14, 2017
f6b042d
fixed admin identity spec
Jun 15, 2017
55c73bc
fixed admin controller specs
Jun 15, 2017
b1146d6
fixing arm specs...
Jun 15, 2017
5fa4e55
fixed arm specs
Jun 15, 2017
880add0
fixed additional details specs
Jun 15, 2017
82217ba
fixed associated users controller specs
Jun 15, 2017
f7c710e
fixed catalog manager controller specs
Jun 15, 2017
88221c7
fixed catalogs specs
Jun 15, 2017
fbbcb26
fixed contact forms specs
Jun 15, 2017
5c06a4c
finished dashboard/approvals
Jun 15, 2017
ff4597b
finished dashboard arms
Jun 15, 2017
063d811
fixed associated users
Jun 15, 2017
ec3d39f
jtm finished some controller specs
BigChiefSmidgeums Jun 15, 2017
c6b374b
More spec work
BigChiefSmidgeums Jun 15, 2017
28e7df0
Skipped a spec
BigChiefSmidgeums Jun 15, 2017
dd69512
fixed additional details specs
Jun 14, 2017
a78547c
fixed additional details specs
Jun 15, 2017
17c82c6
fixed associated users
Jun 15, 2017
e9fdfcf
jtm finished some controller specs
BigChiefSmidgeums Jun 15, 2017
f4e55a8
More spec work
BigChiefSmidgeums Jun 15, 2017
5d1ea69
fixed dashboard/documents
Jun 15, 2017
d16df15
jtm some api spec fixin's
BigChiefSmidgeums Jun 15, 2017
c76555e
jtm feature specs
BigChiefSmidgeums Jun 15, 2017
ab5bf20
jtm fixed protocol filter delete error
BigChiefSmidgeums Jun 15, 2017
ad3c11b
fixed additional details specs
Jun 14, 2017
910c452
fixed additional details specs
Jun 15, 2017
5c3ce8b
fixed associated users
Jun 15, 2017
a0fe079
jtm finished some controller specs
BigChiefSmidgeums Jun 15, 2017
e13e871
More spec work
BigChiefSmidgeums Jun 15, 2017
e1f923b
fixed catalog manager specs
Jun 15, 2017
8056d26
fixed specs
Jun 15, 2017
52bf8c6
syntax error
Jun 15, 2017
6af1e83
jtm left a binding.pry
BigChiefSmidgeums Jun 15, 2017
7fae128
fixed features
Jun 16, 2017
10b83c7
jtm spec fixing
BigChiefSmidgeums Jun 16, 2017
f1a8296
jtm finished up lib and job specs
BigChiefSmidgeums Jun 16, 2017
4b7f3e4
fixed syntax error
Jun 16, 2017
e014bc0
jtm merge conflicts
BigChiefSmidgeums Jun 16, 2017
2e7f462
Added rake task to add migration rails version
BigChiefSmidgeums Jun 16, 2017
8d4f62a
Fixed rake task for adding version numbers to migrations
BigChiefSmidgeums Jun 19, 2017
568ff43
updated schema
Jun 19, 2017
ebc4c1c
fixed specs
Jun 19, 2017
26775fd
fixed these specs
Jun 19, 2017
692b92e
fixed back these controller specs
Jun 19, 2017
837acd2
these arent on master
Jun 19, 2017
8e75236
merged in master and fixed tests
Jun 19, 2017
8cd3791
fix travis?
Jun 19, 2017
ec092b6
Fixed some db issues
BigChiefSmidgeums Jun 19, 2017
47cbae2
created at and updated at are null: false
Jun 20, 2017
f51e926
ran rails app:update, and added new config
Jun 20, 2017
2cee54c
Fixed xml spec
BigChiefSmidgeums Jun 20, 2017
142d463
fixed conflicts
Jun 20, 2017
4ed26e2
removed spec test files
Jun 20, 2017
37a1288
wth & jtm - Update to Rails 5.1.1
Jun 20, 2017
e0bb098
fixed conflicts
Jul 5, 2017
a98145a
updated to 5.1.2
Jul 7, 2017
6044b35
fixed conflicts
Jul 11, 2017
d70c075
fixed specs
Jul 12, 2017
1a38984
fixing specs and conflicts
Jul 12, 2017
fda719e
fix conflicts
Jul 12, 2017
4b1b7e9
fixing specs with change to vg controller
Jul 13, 2017
5d19cd7
fixed conflicts...again
Jul 13, 2017
41d6954
fixed merged in controller specs
Jul 13, 2017
5659458
fixed specs
Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ gem 'pdfkit'
gem 'prawn', '0.12.0'
gem 'premailer-rails'
gem 'rack-mini-profiler'
gem 'rails', '~> 5.0', '>= 5.0.3'
gem 'rails', '~> 5.1', '>= 5.1.2'
gem 'rails-html-sanitizer'
# Needed to used audited-activerecord w/ Rails 5
gem "rails-observers", github: 'rails/rails-observers'
Expand Down