Peter Amstutz [Tue, 15 Apr 2014 14:02:02 +0000 (10:02 -0400)]
Merge branch 'master' into 1971-show-image-thumbnails
Conflicts:
apps/workbench/app/views/collections/_show_files.html.erb
Tom Clegg [Tue, 15 Apr 2014 03:56:04 +0000 (23:56 -0400)]
Merge branch '2388-bogus-token-error-page'
closes #2388
radhika chippada [Tue, 15 Apr 2014 01:51:04 +0000 (21:51 -0400)]
Merge branch 'master' into 1776-setup-user-email
Tim Pierce [Mon, 14 Apr 2014 20:39:52 +0000 (16:39 -0400)]
Merge branch '2449-keep-write-blocks'
Closes #2449, closes #2292, closes #2507.
Ward Vandewege [Mon, 14 Apr 2014 20:31:07 +0000 (16:31 -0400)]
Do not blow up when HOME is not set.
radhika chippada [Mon, 14 Apr 2014 19:38:32 +0000 (15:38 -0400)]
Merge branch 'master' into 1776-setup-user-email
Conflicts:
services/api/app/controllers/arvados/v1/users_controller.rb
Tim Pierce [Mon, 14 Apr 2014 19:23:04 +0000 (15:23 -0400)]
Merge branch 'master' into 2449-keep-write-blocks
Peter Amstutz [Mon, 14 Apr 2014 18:50:41 +0000 (14:50 -0400)]
Reverted Gemfile.lock
Peter Amstutz [Mon, 14 Apr 2014 15:22:41 +0000 (11:22 -0400)]
Links controller checks that head/tail_kind matches head/tail_uuid.
Added test.
Peter Amstutz [Fri, 11 Apr 2014 19:45:08 +0000 (15:45 -0400)]
Reverted accidental change to Gemfile.
Restored parameter check in load_filters_param.
Removed spurious commented-out code from test.
Peter Amstutz [Mon, 14 Apr 2014 13:54:10 +0000 (09:54 -0400)]
Merge remote-tracking branch 'origin/master' into origin-2228-check-filter-uuid-columns
Peter Amstutz [Mon, 14 Apr 2014 13:31:42 +0000 (09:31 -0400)]
* Refactored to remove load_kind_params filter and instead override load_where_param and load_filters_param in the links and logs controllers to add the _kind functionality.
* Removed 'rescue' clause. I think I left that in from debugging.
* Fixed :log -> :logs
* filters: ['tail_kind','=','arvados#user'] works
* Added more tests.
* Added equivalent logic and tests for logs controller for object_kind
Tom Clegg [Sun, 13 Apr 2014 19:38:00 +0000 (15:38 -0400)]
Fix exception when valid token points to missing user
Tom Clegg [Sun, 13 Apr 2014 05:39:35 +0000 (01:39 -0400)]
Add tests to expose some token handling bugs.
Tom Clegg [Sun, 13 Apr 2014 05:33:33 +0000 (01:33 -0400)]
Move test-api-server framework so it works in functional and unit tests too.
Tom Clegg [Sun, 13 Apr 2014 05:15:23 +0000 (01:15 -0400)]
Add token that is valid except that it points to a missing user.
Tom Clegg [Sun, 13 Apr 2014 05:14:05 +0000 (01:14 -0400)]
Send HTTP 500 if we end up in render_error without a more specific status.
Tim Pierce [Sat, 12 Apr 2014 18:26:43 +0000 (14:26 -0400)]
Merge branch 'master' into 2449-keep-write-blocks
Tim Pierce [Sat, 12 Apr 2014 18:24:49 +0000 (14:24 -0400)]
Clean up error handling (refs #2292).
Tim Pierce [Sat, 12 Apr 2014 04:41:56 +0000 (00:41 -0400)]
Code review comments (refs #2292)
Tim Pierce [Fri, 11 Apr 2014 21:28:39 +0000 (17:28 -0400)]
Merge branch 'master' into 2449-keep-write-blocks
Peter Amstutz [Fri, 11 Apr 2014 20:29:38 +0000 (16:29 -0400)]
Updated Job section of API documentation regarding repository and
nondeterministic attributes. refs #2488
Tim Pierce [Fri, 11 Apr 2014 20:05:45 +0000 (16:05 -0400)]
Update documentation for command-line flags (closes #2463, closes #2591).
Peter Amstutz [Fri, 11 Apr 2014 20:04:28 +0000 (16:04 -0400)]
Merge remote-tracking branch 'origin/master' into origin-2228-check-filter-uuid-columns
Conflicts:
services/api/app/models/arvados_model.rb
Peter Amstutz [Fri, 11 Apr 2014 19:45:08 +0000 (15:45 -0400)]
API server tests pass, workbench tests are failing
Tim Pierce [Fri, 11 Apr 2014 19:44:27 +0000 (15:44 -0400)]
Added ReadAtMost function for reading request data (refs #2292)
ReadAtMost will read up to the specified number of bytes, returning
an error if the request is larger than that limit.
Tim Pierce [Fri, 11 Apr 2014 18:48:14 +0000 (14:48 -0400)]
Updating docs for code review (refs #2463)
Tim Pierce [Fri, 11 Apr 2014 17:34:43 +0000 (13:34 -0400)]
Merge branch 'master' into 2449-keep-flags
Tim Pierce [Fri, 11 Apr 2014 17:33:05 +0000 (13:33 -0400)]
Merge branch 'master' into 2449-keep-write-blocks
Brett Smith [Fri, 11 Apr 2014 17:02:25 +0000 (13:02 -0400)]
Merge branch '2375-log-table' into master
We add a log to the Log table whenever another model is created,
updated, or destroyed. Closes #2375, #2559.
Tom Clegg [Fri, 11 Apr 2014 16:59:04 +0000 (12:59 -0400)]
Merge branch '2246-fix-git-clone-race'
closes #2246
Tim Pierce [Fri, 11 Apr 2014 15:29:04 +0000 (11:29 -0400)]
Merge branch '2449-keep-write-blocks' into 2449-keep-flags
Tim Pierce [Fri, 11 Apr 2014 14:43:56 +0000 (10:43 -0400)]
Added todo for TestPutBlockWriteErr (refs #2292)
Tim Pierce [Fri, 11 Apr 2014 14:27:11 +0000 (10:27 -0400)]
Merge branch 'master' into 2449-keep-write-blocks
Tim Pierce [Fri, 11 Apr 2014 14:25:51 +0000 (10:25 -0400)]
Added TestPutBlockCollision (refs #2292).
Brett Smith [Fri, 11 Apr 2014 14:14:12 +0000 (10:14 -0400)]
api: Don't include API tokens in logs.
Refs #2375. See Tom's comments.
I also renamed UNLOGGED_ATTRIBUTES to UNLOGGED_CHANGES to help clarify
that it's not used by logged_attributes.
Peter Amstutz [Fri, 11 Apr 2014 13:44:13 +0000 (09:44 -0400)]
Merged master
Brett Smith [Fri, 11 Apr 2014 13:35:49 +0000 (09:35 -0400)]
api: More robust tests for log properties.
This ensures that logs always have the old/new_etag/attributes
properties, even if they're expressly set to nil.
Brett Smith [Fri, 11 Apr 2014 13:20:35 +0000 (09:20 -0400)]
api: Improve test for selective API auth logging.
radhika chippada [Fri, 11 Apr 2014 13:17:48 +0000 (09:17 -0400)]
Merge branch '2272-fix-setup-user-in-workbench'
radhika chippada [Fri, 11 Apr 2014 13:09:59 +0000 (09:09 -0400)]
Merge branch 'master' of git.curoverse.com:arvados
Tom Clegg [Fri, 11 Apr 2014 03:55:20 +0000 (23:55 -0400)]
Merge branch '2338-maintain-active-tab'
closes #2338
Tom Clegg [Fri, 11 Apr 2014 03:47:10 +0000 (23:47 -0400)]
Add/fix some shell quoting.
Tom Clegg [Fri, 11 Apr 2014 03:46:42 +0000 (23:46 -0400)]
Add comments to explain different ways we choose $repo.
Tom Clegg [Fri, 11 Apr 2014 03:23:16 +0000 (23:23 -0400)]
Merge branch '2243-fix-pipeline-instance-heading'
closes #2243
Tom Clegg [Fri, 11 Apr 2014 03:20:36 +0000 (23:20 -0400)]
Update README for selenium+headless: install firefox+xvfb
instead of libqt+phantomjs
radhika chippada [Thu, 10 Apr 2014 20:44:17 +0000 (16:44 -0400)]
Fix the users test to get the created user id
Tim Pierce [Thu, 10 Apr 2014 20:34:45 +0000 (16:34 -0400)]
Merge branch 'master' into 2449-keep-write-blocks
Tim Pierce [Thu, 10 Apr 2014 20:31:47 +0000 (16:31 -0400)]
Update for code review (refs #2292).
* Use ioutil.TempFile to write new blocks, renaming to the correct
name upon success.
* PutBlock should overwrite corrupt blocks, not report a collision.
* Get free disk space from syscall.Statfs, not `df`.
Brett Smith [Thu, 10 Apr 2014 19:11:09 +0000 (15:11 -0400)]
api: Don't log common changes to API tokens.
The last_used_* attributes are updated very often. Logging those
changes would probably make the logs less useful.
Brett Smith [Thu, 10 Apr 2014 18:46:45 +0000 (14:46 -0400)]
api: Raise errors from saving logs.
With this change, I realized it'd be cleaner to write the
implementation as after_* callbacks, so this includes that. But the
fundamental change is to use log.save! instead of plain log.save.
radhika chippada [Thu, 10 Apr 2014 17:04:43 +0000 (13:04 -0400)]
Comment out failing assertions for now.
Brett Smith [Thu, 10 Apr 2014 15:43:55 +0000 (11:43 -0400)]
api: Have users own the logs they generate.
Setting the owner to the system user was intended to provide the
security policy we wanted. Now that we've opted instead to give logs
overrides for the permission_to_ACTION methods, users should own their
own logs so they can read them.
Brett Smith [Thu, 10 Apr 2014 14:41:49 +0000 (10:41 -0400)]
api: Let admin users delete logs.
Brett Smith [Thu, 10 Apr 2014 14:15:53 +0000 (10:15 -0400)]
api: Test that we don't make logs about logs.
Brett Smith [Thu, 10 Apr 2014 14:05:28 +0000 (10:05 -0400)]
Merge branch 'master' into 2375-log-table
radhika chippada [Wed, 9 Apr 2014 21:03:54 +0000 (17:03 -0400)]
Merge branch 'master' into 1776-setup-user-email
radhika chippada [Wed, 9 Apr 2014 21:01:44 +0000 (17:01 -0400)]
Merge branch 'master' of git.curoverse.com:arvados
radhika chippada [Wed, 9 Apr 2014 21:00:28 +0000 (17:00 -0400)]
Story 1776: Add theme to api server similar to workbench. Updated files: Gemfile, app/controllers/application_controller.rb, config/application.default.yml, config/routes.rb
radhika chippada [Wed, 9 Apr 2014 20:26:05 +0000 (16:26 -0400)]
Story 1776: Add tests for setup email
Brett Smith [Wed, 9 Apr 2014 19:34:16 +0000 (15:34 -0400)]
api: Give all Job fixtures script_versions.
Workbench tries to call to_sym on these versions, and hiccups if it's
nil. This makes it easier to run integration tests, whether
automatically or by hand.
radhika chippada [Wed, 9 Apr 2014 17:56:34 +0000 (13:56 -0400)]
Use selenium driver with headless for testing.
radhika chippada [Wed, 9 Apr 2014 14:07:09 +0000 (10:07 -0400)]
Merge branch 'master' of git.curoverse.com:arvados
Tom Clegg [Wed, 9 Apr 2014 03:58:48 +0000 (23:58 -0400)]
Get logs and archives directly from the given git repo. Skip git-clone
and attendant race conditions.
Tom Clegg [Wed, 9 Apr 2014 03:34:25 +0000 (23:34 -0400)]
Add "create collection" integration test
Tom Clegg [Wed, 9 Apr 2014 03:45:12 +0000 (23:45 -0400)]
Trim newline from output hash emerging from `arv keep put`.
Tom Clegg [Wed, 9 Apr 2014 03:32:27 +0000 (23:32 -0400)]
Fix tests: make sure system_user exists before making "pre-test users" list
Tom Clegg [Wed, 9 Apr 2014 02:51:36 +0000 (22:51 -0400)]
Stash and restore current tab selections when replacing body content.
Tom Clegg [Wed, 9 Apr 2014 02:21:46 +0000 (22:21 -0400)]
Show editable pipeline instance name (instead of template name) as
instance page heading.
Tom Clegg [Tue, 8 Apr 2014 23:50:46 +0000 (19:50 -0400)]
Fix permission error when adding system_group->new_user permission link.
Tom Clegg [Tue, 8 Apr 2014 23:08:33 +0000 (19:08 -0400)]
Change password placeholder to something db:load_config can parse.
radhika chippada [Tue, 8 Apr 2014 21:29:03 +0000 (17:29 -0400)]
Story #1776: Add mailer and update users_controller. Also, update workbench and setup script to pass the additional send notification parameter.
Brett Smith [Tue, 8 Apr 2014 20:18:46 +0000 (16:18 -0400)]
api: Make a Log from other model changes.
Refs #2375.
Brett Smith [Mon, 7 Apr 2014 18:54:06 +0000 (14:54 -0400)]
api: Rename Log.info to .properties.
Refs #2375.
Tim Pierce [Tue, 8 Apr 2014 18:11:24 +0000 (14:11 -0400)]
Merge branch 'master' into 2449-keep-write-blocks
Tim Pierce [Tue, 8 Apr 2014 18:09:53 +0000 (14:09 -0400)]
Merge branch '2449-keep-write-blocks' into 2449-keep-flags
Conflicts:
services/keep/keep.go
radhika chippada [Tue, 8 Apr 2014 16:00:32 +0000 (12:00 -0400)]
Move the javascript into a js file instead of using <script> tag in html file.
radhika chippada [Tue, 8 Apr 2014 14:40:31 +0000 (10:40 -0400)]
Remove trailing white spaces.
radhika chippada [Tue, 8 Apr 2014 14:29:40 +0000 (10:29 -0400)]
Add paste event check for submit button validation
Tom Clegg [Tue, 8 Apr 2014 05:55:17 +0000 (01:55 -0400)]
Use bootstrap/theme style defaults for user setup modal and form.
radhika chippada [Mon, 7 Apr 2014 19:04:06 +0000 (15:04 -0400)]
Reset form fields on cancel.
radhika chippada [Mon, 7 Apr 2014 18:44:49 +0000 (14:44 -0400)]
Submit
radhika chippada [Mon, 7 Apr 2014 18:03:01 +0000 (14:03 -0400)]
Bootstrap modal css updated to include only what is needed.
radhika chippada [Mon, 7 Apr 2014 15:58:08 +0000 (11:58 -0400)]
Add header and footer to the setup user modal
Tom Clegg [Fri, 4 Apr 2014 21:21:45 +0000 (17:21 -0400)]
Document capybara-webkit qt dependencies, and add phantomjs recipe.
radhika chippada [Fri, 4 Apr 2014 19:45:53 +0000 (15:45 -0400)]
Add email format validation to the input text field in the setup modal.
radhika chippada [Fri, 4 Apr 2014 18:53:42 +0000 (14:53 -0400)]
During setup of an existing user, create oid login permission, if it does not already exist.
radhika chippada [Fri, 4 Apr 2014 17:36:01 +0000 (13:36 -0400)]
Need to remove the user's "all users" group read permission during unsetup.
This shortcoming became apparent during testing when "is_invited" flag is checked.
radhika chippada [Fri, 4 Apr 2014 14:45:14 +0000 (10:45 -0400)]
Use webkit driver for Capybara instead of selenium for tests that need dialog handling.
radhika chippada [Fri, 4 Apr 2014 02:41:42 +0000 (22:41 -0400)]
Added integration tests for create new user, setup and unsetup existing user. The tests use selenium driver without headless. Hence, we see the browser while these tests are running.
Next step is to use headless to hide the browser during test execution.
radhika chippada [Thu, 3 Apr 2014 18:23:10 +0000 (14:23 -0400)]
Integration test for setup user
radhika chippada [Thu, 3 Apr 2014 15:05:47 +0000 (11:05 -0400)]
Submit button enabling revisited
radhika chippada [Thu, 3 Apr 2014 11:39:06 +0000 (07:39 -0400)]
Submit button enabled when existing user
radhika chippada [Thu, 3 Apr 2014 11:17:03 +0000 (07:17 -0400)]
popup submit button
radhika chippada [Thu, 3 Apr 2014 01:08:03 +0000 (21:08 -0400)]
Get the default openid_prefix from config.
radhika chippada [Thu, 3 Apr 2014 00:56:54 +0000 (20:56 -0400)]
Look for repo_name in VM link
radhika chippada [Thu, 3 Apr 2014 00:28:14 +0000 (20:28 -0400)]
Require only email and openid prefix in the setup popup. The other fields are optional.
radhika chippada [Wed, 2 Apr 2014 23:51:45 +0000 (19:51 -0400)]
New user creation using setup action is working
radhika chippada [Wed, 2 Apr 2014 22:52:04 +0000 (18:52 -0400)]
"Add a new user" link uses setup method to create a "loaded" user.
radhika chippada [Wed, 2 Apr 2014 16:57:13 +0000 (12:57 -0400)]
Minor UI tweaks