Sync with master #1448
Merged
Sync with master #1448
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…erence-files BUG: Remove unused argument in function
Fixing SQL for adding demo user to production env
bootstrap theme is required for building the help page
If the base data directory was not set, a default one would be selected, by using '..' to refer to a directory below, which in turn would inconsistently flag users as lacking permissions: ``` QiitaPetAuthorizationError: User demo@microbio.me is not authorized to access /Users/yoshikivazquezbaeza/.virtualenvs/qiita-0.2.0-rc1/lib/python2.7/site-packages/qiita_db/support_files/test_data/job/1_summarize_taxa_through_plots.py_output_dir/taxa_summary_plots/bar_charts.html ``` Although the paths were the same, this is verified through string matching thus 'lol/foo/../jk' and 'lol/jk' would not match (see example structure below) even though they refer to the same folder: lol/ ├── foo │ └── file.txt ├── jk └── plel
BUG: Fix problem with default basedir
REL: change versions to 0.2.0
[DO NOT MERGE] REL: Change versions to 0.2.0-dev
Change the example email address, remove colorado
|
@antgonza, where there any merge conflicts? |
|
Nop, just rather have it sync before there are any ... better safe than sorry. I will create a PR with my actual changes in a second. |
|
Thanks, in that case I will just merge them, sounds good? Before creating your other PR, can you create the PR from upstream ebi-improvements to upstream master? In that PR we can list the things that remains to be done. It will get automatically updated as we are merging the remaining PR. |
|
Yup and yup. |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This one is actually going to ebi-improvements and is jus syncing to master.