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.

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 Improvements to offspring_controller #47

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
8668d71
WIP Addition of tests to enable admin to stop changes in users, as TO…
alexvkcr Jul 26, 2016
bf14d4f
Manual rebase
alexvkcr Aug 26, 2016
52ae215
Manual rebase
alexvkcr Aug 26, 2016
cc2e7fa
Manual rebase 2
alexvkcr Aug 26, 2016
3ffeca9
Manual rebase 3
alexvkcr Aug 26, 2016
0cfff12
Little fixes
alexvkcr Aug 24, 2016
6b11039
manual rebase
alexvkcr Aug 29, 2016
1cce4a1
Undo rubocop failure in spec helper
alexvkcr Aug 26, 2016
6d58665
Rubocop fixes
alexvkcr Aug 26, 2016
dfcf989
Rename of some methods
alexvkcr Aug 26, 2016
70142f3
Update back to split PR #14
alexvkcr Aug 29, 2016
7da0752
joined system lock view with functionality
katafira Aug 30, 2016
38e791e
small link fix in view
katafira Aug 30, 2016
e9ee880
normal users cannot assign shifts if system is locked
katafira Aug 30, 2016
580e406
fixed persistence problem
alexvkcr Aug 31, 2016
213ff7f
Fix for rubocop
alexvkcr Aug 31, 2016
c998932
Merge branch 'master' into admin_stop
alexvkcr Aug 31, 2016
28a02ff
WIP Addition of tests to enable admin to stop changes in users, as TO…
alexvkcr Jul 26, 2016
b7139c5
Manual rebase
alexvkcr Aug 26, 2016
653e596
Manual rebase
alexvkcr Aug 26, 2016
30397cb
Manual rebase 2
alexvkcr Aug 26, 2016
0aeef33
Manual rebase 3
alexvkcr Aug 26, 2016
82f8361
Little fixes
alexvkcr Aug 24, 2016
608b332
manual rebase
alexvkcr Aug 29, 2016
fc654a4
Undo rubocop failure in spec helper
alexvkcr Aug 26, 2016
599c608
Rubocop fixes
alexvkcr Aug 26, 2016
a62aaa2
Rename of some methods
alexvkcr Aug 26, 2016
9bebf64
Update back to split PR #14
alexvkcr Aug 29, 2016
c8a3f08
manual rebase
katafira Sep 1, 2016
609fa1c
manual rebase 2
katafira Sep 1, 2016
273a3f7
normal users cannot assign shifts if system is locked
katafira Aug 30, 2016
041c278
manual rebase 3
katafira Sep 1, 2016
4dd62ed
manual rebase 4
katafira Sep 1, 2016
db4b7ac
manual rebase 5
katafira Sep 1, 2016
47485e1
manual rebase 6
katafira Sep 1, 2016
e54c7de
Little fixes
alexvkcr Aug 24, 2016
52914cd
manual rebase
alexvkcr Aug 29, 2016
1f232d2
Undo rubocop failure in spec helper
alexvkcr Aug 26, 2016
5d123ad
manual rebase 9
katafira Sep 1, 2016
695bd58
manual rebase 10
katafira Sep 1, 2016
6522ca2
manual rebase 11
katafira Sep 1, 2016
8a8c88d
manual rebase 13
katafira Sep 1, 2016
e83f534
Fix for rubocop
alexvkcr Aug 31, 2016
ec5efc4
manual rebase 15
katafira Sep 1, 2016
b87eca3
updated rack gem to fix ddos vulnerability
katafira Sep 1, 2016
d96404f
Merge branch 'master' into admin_stop
Sep 1, 2016
b2aac19
Merge branch 'master' into admin_stop
Sep 1, 2016
03c344e
Little changes to controller alert msgs
Aug 31, 2016
58c2cee
Finished controller fixes
Aug 31, 2016
6af38f0
Fixed tiny error
Aug 31, 2016
e32f4c7
WIP1
Sep 1, 2016
bf54b7b
WIP1.1
Sep 1, 2016
4f981b5
Finish fixing bug
Sep 1, 2016
3298542
Finished and ready to upload
Sep 1, 2016
9dae3c8
Rebase con admin_stop
Sep 1, 2016
a1efb73
Manual Rebase 1
Sep 2, 2016
39f9183
Manual rebase 2
Sep 2, 2016
3d53e7f
Manual rebase 3
Sep 2, 2016
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
Next Next commit
WIP Addition of tests to enable admin to stop changes in users, as TO…
…DO file says
  • Loading branch information
alexvkcr committed Aug 31, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 8668d71d6617d2154999250b9e631a7f6a109627
5 changes: 5 additions & 0 deletions spec/controllers/admin_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -10,6 +10,11 @@
expect(response).to have_http_status(:success)
end
end
describe "can block any change in the data" do
pending "succesfully"
pending "and unblock changes"
pending ", users cas still delete their own account"
end
end

let(:user) { FactoryGirl.create(:user) }