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

[WIP] Add cancel account button to Admin user edit view #321

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

[WIP] Add cancel account button to Admin user edit view #321

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
32db415
work in progress
cofiem Jan 20, 2017
a5d23ac
Merge branch 'develop' into feature-delete-account-for-admin
cofiem Feb 8, 2017
c235524
UI changes finished (still in progress)
cofiem Feb 8, 2017
04fc01a
working on user archive tests and controller setup
cofiem Feb 14, 2017
b686b38
working on user archive tests and controller setup
cofiem Feb 14, 2017
d802cd1
added custom auth to DELETE /my_account
cofiem Feb 16, 2017
b009d57
updated UI to match new spec for deleting users
cofiem Feb 19, 2017
d243722
more changes for deleting users
cofiem Feb 20, 2017
eba640a
all except cascade delete implemented
cofiem Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,31 @@ gem 'activesupport-json_encoder', git: 'https://github.com/rails/activesupport-j
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0.3'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '~> 3.0.0'
gem 'uglifier', '~> 3.0.4'
# Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 4.2.0'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', '~> 0.12.1', platforms: :ruby, require: 'v8'

# Use jquery as the JavaScript library
gem 'jquery-rails', '~> 4.2.0'
gem 'jquery-rails', '~> 4.2.2'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
#gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.6.0'
gem 'jbuilder', '~> 2.6.1'

gem 'haml', '~> 4.0.6'
gem 'haml-rails', '~> 0.9.0'

gem 'simple_form', '~> 3.3.0'
gem 'paperclip', '~> 5.0.0'
gem 'kramdown', '~> 1.12.0'
gem 'paperclip', '~> 5.1.0'
gem 'kramdown', '~> 1.13.1'

# Bootstrap UI
gem 'bootstrap-sass', '~> 3.3.4'
# for sass variables: http://getbootstrap.com/customize/#less-variables
# sprockets-rails gem is included via rails dependency
gem 'font-awesome-sass', '~> 4.6.2'
gem 'font-awesome-sass', '~> 4.7.0'

# for rails 3, 4
gem 'kaminari'
Expand All @@ -64,14 +64,14 @@ gem 'recaptcha', '~> 3.3.0', require: 'recaptcha/rails'

# for proper timezone support
gem 'tzinfo', '~> 1.2.2'
gem 'tzinfo-data', '~> 1.2016'
gem 'tzinfo-data', '~> 1.2016.10'

# USERS & PERMISSIONS
# -------------------------------------
# https://github.com/plataformatec/devise/blob/master/CHANGELOG.md
# http://joanswork.com/devise-3-1-update/
gem 'devise', '~> 4.2.0'
gem 'devise-i18n'
gem 'devise-i18n', '~> 1.1.1'
gem 'cancancan', '~> 1.15'
gem 'role_model', '~> 0.8.1'
# Use ActiveModel has_secure_password
Expand All @@ -82,7 +82,7 @@ gem 'bcrypt', '~> 3.1.9'
# -------------------------------------
# don't change the database gems - causes:
# Please install the <db> adapter: `gem install activerecord-<db>-adapter` (<db> is not part of the bundle. Add it to Gemfile.)
gem 'pg', '~> 0.18.1'
gem 'pg', '~> 0.19.0'

# MODELS
# -------------------------------------
Expand All @@ -94,7 +94,7 @@ gem 'jc-validates_timeliness', '~> 3.1.1'
# No longer used - incorporated the gem's functionality directly.
#gem 'userstamp', git: 'https://github.com/theepan/userstamp.git'

gem 'enumerize', '~> 2.0'
gem 'enumerize', '~> 2.0.1'
gem 'uuidtools', '~> 2.1.5'

# Note: if other modifications are made to the default_scope
Expand All @@ -104,7 +104,7 @@ gem 'acts_as_paranoid', git: 'https://github.com/ActsAsParanoid/acts_as_paranoid


# for state machines
gem 'aasm'
gem 'aasm', '~> 4.11.1'

# SETTINGS
# -------------------------------------
Expand All @@ -114,12 +114,12 @@ require 'rbconfig'
# MONITORING
# -------------------------------------
gem 'exception_notification', '~> 4.2.0'
gem 'newrelic_rpm', '~> 3.16'
gem 'newrelic_rpm', '~> 3.17.2'

# Documentation & UI
# -------------------------------------
# these gems are required here to serve /doc url
gem 'rspec_api_documentation', '~> 4.8.0'
gem 'rspec_api_documentation', '~> 4.9.0'
gem 'raddocs', '~> 1.0.0'

# MEDIA
Expand Down Expand Up @@ -151,8 +151,8 @@ group :development, :test do
gem 'quiet_assets'

gem 'rack-mini-profiler', '~> 0.10.0'
gem 'i18n-tasks', '~> 0.9.0'
gem 'bullet', '~> 5.2.0'
gem 'i18n-tasks', '~> 0.9.8'
gem 'bullet', '~> 5.5.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
#gem 'spring', '~> 1.4.0'
Expand All @@ -161,18 +161,18 @@ group :development, :test do
#gem 'web-console', '~> 2.1.1'

# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0'
gem 'sdoc', '~> 0.4.2'

gem 'thin', '~> 1.7.0'

gem 'notiffany', '~> 0.1.0'
gem 'guard', '~> 2.14.0'
gem 'guard-rspec', '~> 4.7.0'
gem 'guard-yard', '~> 2.1.4', require: false
gem 'rubocop', '~> 0.42.0', require: false
gem 'haml_lint', require: false
gem 'guard-yard', '~> 2.2.0', require: false
gem 'rubocop', '~> 0.46.0', require: false
gem 'haml_lint', '~> 0.19.0', require: false

gem 'fakeredis', '~> 0.5.0', require: 'fakeredis/rspec'
gem 'fakeredis', '~> 0.6.0', require: 'fakeredis/rspec'

gem 'zonebie'

Expand All @@ -196,21 +196,21 @@ group :development, :test do
# gem install traceroute --no-ri --no-rdoc

gem 'rspec-rails', '~> 3.5.0'
gem 'factory_girl_rails', '~> 4.7.0'
gem 'capybara', '~> 2.7.0'
gem 'factory_girl_rails', '~> 4.8.0'
gem 'capybara', '~> 2.11.0'

gem 'rspec', '~> 3.5.0'
gem 'simplecov', '~> 0.12.0', require: false
gem 'launchy', '~> 2.4.3'
gem 'json_spec', '~> 1.1.4'
gem 'database_cleaner', '~> 1.5.0'

gem 'coveralls', '~> 0.8.14', require: false
gem 'codeclimate-test-reporter', '~> 0.6.0', require: nil
gem 'coveralls', '~> 0.8.17', require: false
gem 'codeclimate-test-reporter', '~> 1.0.4', require: nil
end

group :test do
gem 'webmock', '~> 2.1.0'
gem 'webmock', '~> 2.3.1'
gem 'shoulda-matchers', '< 3.0.0', require: false

gem 'rspec-mocks', '~>3.5.0'
Expand Down
Loading