Skip to content

develop -> master - #485

Merged
OmarIthawi merged 15 commits into
appsembler/tahoe/masterfrom
appsembler/tahoe/develop
Dec 3, 2019
Merged

develop -> master#485
OmarIthawi merged 15 commits into
appsembler/tahoe/masterfrom
appsembler/tahoe/develop

Conversation

@OmarIthawi

@OmarIthawi OmarIthawi commented Nov 21, 2019 •
edited
Loading

Copy link
Copy Markdown

Some fixes including completion!

TODO

  • Spot checking on staging by Omar.
  • Spot checking on staging by someone else.

OmarIthawi and others added 12 commits November 13, 2019 15:40
@OmarIthawi
Hide the re-index button for non-global staff
d4a5ace
@OmarIthawi
Merge pull request #480 from appsembler/omar/cp-reindex-course-staff
91c21c5 
Hide the re-index button for non-global staff
@OmarIthawi
Make studio file uploads site aware
2da6bf5
@OmarIthawi
Merge pull request #482 from appsembler/omar/upload-url
4cd6397 
Make studio file uploads site aware
@OmarIthawi
Run Tahoe tests on TravisCI (part 2)
f994faf
@OmarIthawi
Merge pull request #479 from appsembler/omar/run-tahoe-tests
a98304e 
Run Tahoe tests on TravisCI (part 2)
@OmarIthawi
Make retrieve_last_sitewide_block_completed site aware
b59e269 
By removing the `domain` part and using relative URLs instead
@OmarIthawi
Improve the performance of retrieve_last_sitewide_block
3952a04 
By making the query only when needed
@OmarIthawi
Move travis hacks to travis file
dbac12e 
Plus allow running any test via `$ tox -e py27-pytest -- some_test.py`
@OmarIthawi
Merge pull request #486 from appsembler/omar/fix-giant-query-for-comp…
6d29ef2 
…letion

Performance improvements for the Site Configurations when completion is enabled
@OmarIthawi
Merge pull request #488 from appsembler/omar/tests-fixups
c761578 
Travis cleanup + allow running any test
@thraxil
docker and cloudbuild setup for running tox
f8a8e81
@OmarIthawi OmarIthawi changed the title (WIP) develop -> master develop -> master Nov 28, 2019
@johnbaldwin

johnbaldwin commented Nov 28, 2019 •
edited
Loading

Copy link
Copy Markdown

@OmarIthawi How much effort to include the PR numbers in the develop -> master PR descriptions? Or do you think it not worth the effort? My thoughts are that if we've reviewed all the PRs that go into the develop -> master and if the develop -> master PR is just an accumulation of those, then it makes the develop -> master PR a sanity check. Do you agree?

johnbaldwin
johnbaldwin approved these changes Nov 28, 2019
View reviewed changes

@johnbaldwin johnbaldwin left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have we spot tested this on Tahoe staging?

@OmarIthawi

OmarIthawi commented Nov 29, 2019 •
edited
Loading

Copy link
Copy Markdown
Author

Thanks @johnbaldwin.

Have we spot tested this on Tahoe staging?

Not yet.

@OmarIthawi How much effort to include the PR numbers in the develop -> master PR descriptions? Or do you think it not worth the effort? My thoughts are that if we've reviewed all the PRs that go into the develop -> master and if the develop -> master PR is just an accumulation of those, then it makes the develop -> master PR a sanity check. Do you agree?

I'm not sure of the effort-to-value of such change in the process.

Could you please explain more about how do you think this could be useful?

@OmarIthawi

OmarIthawi commented Nov 30, 2019 •
edited
Loading

Copy link
Copy Markdown
Author

@melvinsoft I've spot checked the changes on Staging and both looks good. Could you please do one more check so we push it to production early next week?

cc: @johnbaldwin

@OmarIthawi
Merge pull request #495 from appsembler/omar/cp-upstream-19610
8aba77d 
Hide the re-index button for non-global staff
@melvinsoft

melvinsoft commented Dec 2, 2019

Copy link
Copy Markdown

@OmarIthawi Sure, I'll do today. Thanks!

@melvinsoft

melvinsoft commented Dec 2, 2019

Copy link
Copy Markdown

@OmarIthawi I just found 1 small error here. In studio -> Files and Uploads when I upload a new file and try to use the "Web" url, is missing the https at the beginning. But I know you discussed about it with John already, so we can follow up later.

@OmarIthawi

OmarIthawi commented Dec 3, 2019 •
edited
Loading

Copy link
Copy Markdown
Author

@OmarIthawi I just found 1 small error here. In studio -> Files and Uploads when I upload a new file and try to use the "Web" url, is missing the https at the beginning. But I know you discussed about it with John already, so we can follow up later.

Thanks @melvinsoft, yes, it's a known issue. I'd like to hear from itential/other customers first before providing any fix.

@OmarIthawi
OmarIthawi merged commit 99a909f into appsembler/tahoe/master Dec 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

3 more reviewers
@thraxil thraxil thraxil approved these changes
@johnbaldwin johnbaldwin johnbaldwin approved these changes
@melvinsoft melvinsoft melvinsoft approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@OmarIthawi @johnbaldwin @melvinsoft @thraxil