diff --git a/Gemfile.lock b/Gemfile.lock index fa04232848896183cf2ebc8024614ae1765c812a..8aadb039726a6daa4eec6ab2f9d7462c06a8fbb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -83,7 +83,7 @@ GEM nio4r (2.3.1) nokogiri (1.10.1) mini_portile2 (~> 2.4.0) - pg (1.1.4) + pg (1.1.3) puma (3.12.0) rack (2.0.6) rack-test (1.1.0) @@ -154,6 +154,7 @@ DEPENDENCIES bootsnap (>= 1.1.0) listen (>= 3.0.5, < 3.2) pg (>= 0.18, < 2.0) + mysql2 () puma (~> 3.11) rails (~> 5.2.2) sass-rails (~> 5.0) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..ee5839968a2bf86c93283efc09d40fd050b7cfa2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,127 @@ + 木兰宽松许可证, 第2版 + + 木兰宽松许可证， 第2版 + 2020年1月 http://license.coscl.org.cn/MulanPSL2 + + + 您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束： + + 0. 定义 + + “软件”是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。 + + “贡献”是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。 + + “贡献者”是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。 + + “法人实体”是指提交贡献的机构及其“关联实体”。 + + “关联实体”是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。 + + 1. 授予版权许可 + + 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。 + + 2. 授予专利许可 + + 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。 + + 3. 无商标许可 + + “本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。 + + 4. 分发限制 + + 您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。 + + 5. 免责声明与责任限制 + + “软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论，即使其曾被建议有此种损失的可能性。 + + 6. 语言 + “本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。 + + 条款结束 + + 如何将木兰宽松许可证，第2版，应用到您的软件 + + 如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步： + + 1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字； + + 2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中； + + 3， 请将如下声明文本放入每个源文件的头部注释中。 + + Copyright (c) [Year] [name of copyright holder] + [Software Name] is licensed under Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. + + + Mulan Permissive Software License，Version 2 + + Mulan Permissive Software License，Version 2 (Mulan PSL v2) + January 2020 http://license.coscl.org.cn/MulanPSL2 + + Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions: + + 0. Definition + + Software means the program and related documents which are licensed under this License and comprise all Contribution(s). + + Contribution means the copyrightable work licensed by a particular Contributor under this License. + + Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License. + + Legal Entity means the entity making a Contribution and all its Affiliates. + + Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity. + + 1. Grant of Copyright License + + Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not. + + 2. Grant of Patent License + + Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken. + + 3. No Trademark License + + No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in Section 4. + + 4. Distribution Restriction + + You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software. + + 5. Disclaimer of Warranty and Limitation of Liability + + THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + 6. Language + + THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL. + + END OF THE TERMS AND CONDITIONS + + How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software + + To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps: + + i Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner; + + ii Create a file named “LICENSE” which contains the whole context of this License in the first directory of your software package; + + iii Attach the statement to the appropriate annotated syntax at the beginning of each source file. + + + Copyright (c) [Year] [name of copyright holder] + [Software Name] is licensed under Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. diff --git a/README.md b/README.md index bda99c8e58a74d5c561ab7d59824d40038811ff4..e242ab5b268f29f95304d54d46e901137e1a1ec8 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,25 @@ * 介绍 需求描述: 现要打造项目管理工具，维度包括不仅限于:项目，仓库，迭代，任务。其中任务可支持自定义类型，如缺陷、设计等，且不同类型可定义不同状态集合)。项目可以有多仓库，迭代属于某个项目，任务可以属于某个迭代、某个仓库、某个项目。 +```ruby +project_service.rb +project_watchers +event.tag? +``` + + +- 修改readme1 +- 修改readme2 +- 修改readme3 +- 修改readme4 +- 修改readme5 +- 修改readme6 +- 修改readme7 +- 修改readme8 +- 修改readme9 +- 修改readme8 +- 修改readme8 +- 修改readme81 +- 修改readme82 +- 修改readme83 -haha -meiyou diff --git a/app/assets/images/WechatIMG29.jpeg b/app/assets/images/WechatIMG29.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..8313f94e08f026310404e997efa22ad483ef5075 Binary files /dev/null and b/app/assets/images/WechatIMG29.jpeg differ diff --git a/public/images/hohoho.zip b/public/images/hohoho.zip new file mode 100644 index 0000000000000000000000000000000000000000..9aa4a21e9288f3cfc5b045271e084902c751178c Binary files /dev/null and b/public/images/hohoho.zip differ diff --git a/public/images/insert_projects_sql.pdf b/public/images/insert_projects_sql.pdf new file mode 100644 index 0000000000000000000000000000000000000000..fbc1476b846d39455c0ca3d8de38f1163d123c75 Binary files /dev/null and b/public/images/insert_projects_sql.pdf differ diff --git "a/public/images/\344\273\273\345\212\241\345\210\227\350\241\25020190531_16_44.csv" "b/public/images/\344\273\273\345\212\241\345\210\227\350\241\25020190531_16_44.csv" new file mode 100644 index 0000000000000000000000000000000000000000..cd73dc45e2c54ce04c8f2b6459dd204deba269f2 --- /dev/null +++ "b/public/images/\344\273\273\345\212\241\345\210\227\350\241\25020190531_16_44.csv" @@ -0,0 +1,74 @@ +ID,任务名,负责人,协作者,任务状态,任务类型,任务内容,优先级,标签,关联仓库,里程碑,任务创建者,创建时间,计划时间,完成时间,关联分支 +IE,3 features from Rails 4.1 that I’m excited about,liwen,张文文,待办的,任务,"Rails 4.1 was just released this week and I already had a great experience trying out the release candidates on my latest project, so I decided to write a bit about my favorites features on this release and some things I have learned by using them so far. + +1) secrets.yml +Placing your configuration in a YAML file isn’t exactly a revolutionary feature, but the usage of the config/secrets.yml file that comes with Rails 4.1 holds a more important idea: the promise of a default approach for environment aware custom configuration on Rails applications. Over the years the community created several ways to manage such configuration so every app out there deals with this differently, but now we can use the Rails default as a standard just like we do with the app folder or the routing patterns, taking the configuration madness outside the list of things to worry about when working with Rails. So instead of dealing with multiple YAML files or constants left out inside initializers, we can go with the secrets.yml as the default for our apps. + +Remember that you can place any kind of configuration – not just secrets like tokens or passwords – that need to be handled differently through your application environments, like API Endpoints or S3 bucket names. And for any gem maintainers out there, you can make your gem read these settings from the secrets.yml automagically through an initializer block and maybe remove a configuration step from the gem setup. Adding this to Devise on this pull request was easier than I expected and I suggest you to try it out on your gems as well. + +If you want to try to organize your configuration through the secrets.yml without having to update to Rails 4.1 right now, Andrew White backported this feature on the rails-secrets gem for Rails 4.0 apps. + +So, if you are dealing with some configuration mess or aren’t using something like dotenv for your application, I strongly suggest that you try to migrate your config to use the secrets.yml file and see how it goes for your application. + +2) Action Pack Variants +Variants are proving to be a great solution to render device specific views when mixed with any device detection solution like the useragent or browser gems, which you integrate quickly with just a before_action block: + +class ApplicationController < ActionController::Base + before_action :set_variant + + private + + def set_variant + if browser.tablet? + request.variant = :tablet + elsif browser.mobile? + request.variant = :mobile + else + request.variant = :desktop + end + end +end +Even though the main examples are dealing with User Agent sniffing, this feature can be used in any context where you want to have more control of which views are rendered by your application, like: + +A/B Testing different partials based on the user cookies. +API versioning for your Jbuilder templates. +Maintaining current and redesigned views for the same controller. +Authorization aware views, like users/index.html+admin.erb or products/show.html+guest.erb. +In the end, Variants are just a way for you to have more control over how your views will be used by the app, helping you to remove boilerplate logic from your code and letting the framework handle it through a more elegant solution. + +3) The improved cookies serializer +The changes on how Rails serializes cookies are a great improvement when it comes to security and stability of web apps. Before this, any object placed in the cookies Hash would be serialized (and deserialized) through Marshal.dump and Marshal.load, which could possibly lead to remote code execution if an attacker got hold on your application secret. + +Now this serializer is configurable through the config.action_dispatch.cookies_serializer configuration option, and new apps will ship with a smarter default: a JSON serializer that won't recreate complex objects besides Strings, Integers and other JSON data types. And for a smooth upgrade, you can use the :hybrid serializer that will convert your existing marshalled cookies into JSON cookies, so this upgrade can be transparent for your application users. + +This upgrade highlights a possible bad practice in our applications where we end up placing more complex objects in the session that can't be completely restored by the JSON serializer, when we should be using more simple structures for the data stored in cookies. Thanks to a related issue reported on the Devise issue tracker we could simplify the gem code a bit, so instead of serializing Time objects we could work with numbers. + +So, when updating your application to use the :hybrid serializer, don't forget to do a double check of whatever kind of data the app stores in your users cookies and look for possible backwards incompatibility. And if you want to take a closer look on how this was implemented, be sure to check the related issues and pull requests on the Rails repo: #12881, #13692 and #13945. + +Keeping up to date with the latest Rails changes +Following the activity on the Rails repository over GitHub helped a lot to understand better these features and the rationale behind their implementations, but going through all the commits and discussions on Issues and Pull Requests would demand a lot of your time. If you want some of the inside scoop but don't have that much time to go through the Rails activity over the week, Godfrey Chan has put up a weekly digest about Rails named This Week in Rails. I suggest that you subscribe to the list and even check some of the previous editions on the archive page. + +Try it yourself! +Take some time and upgrade one of your Rails 4 apps and try out some of the new features! I bet that some of them will help you improve your codebase or make your coworkers life a bit easier, and we are eager to hear from your experience with the 4.1 release.",不指定,"",力文帅帅/hohoho,,张文文,2019-05-31 12:31:44,"",, +I8,新手任务 - 添加企业成员,张文文,"",待办的,任务,"管理员，您好： + +你的第一个任务是将员工添加进你的企业 +1. 点击 左侧菜单栏【成员】 +![输入图片说明](https://gitee.com/uploads/images/2018/0516/165648_7fd4b5e3_409700.png ""在这里输入图片标题"") + +2. 选择【添加成员】，邀请成员加入企业 +![输入图片说明](https://gitee.com/uploads/images/2018/0516/165711_c8dbf43a_409700.png ""在这里输入图片标题"") + +完成后，你就可以给你的员工分派任务了。 +最后，请回到本任务将状态改为“已完成”。",主要,"",,,张文文,2019-05-22 16:17:38,"",, +I7,新手任务 - 创建第一个仓库,张文文,"",待办的,任务,"作为企业管理员，你可以在 左侧菜单栏项目中【添加仓库】： + +1. 点击 左侧菜单栏 【仓库】 +![输入图片说明](https://images.gitee.com/uploads/images/2018/1217/181217_fd793ae3_379416.png ""在这里输入图片标题"") +2. 选择 【添加仓库】 +![输入图片说明](https://images.gitee.com/uploads/images/2018/1217/181208_179c3f37_379416.png ""在这里输入图片标题"") + +建好仓库后，请回到这里，将本任务的状态改为“已完成”。",主要,"",,,张文文,2019-05-22 16:17:38,"",, +I3,222,,"",待办的,任务,asdfasdfw,不指定,"",力文帅帅/hohoho,,liwen,2019-04-09 10:24:06,"",, +I2,222,,"",待办的,任务,asdfasdfw,不指定,"",力文帅帅/hohoho,,liwen,2019-04-02 11:18:43,"",, +I1,12we,,"",待办的,任务,23rffsdf,不指定,"",力文帅帅/hohoho,,张文文,2019-03-28 11:19:51,"",, diff --git "a/public/images/\345\205\250\347\220\203\345\234\260\345\214\272\346\225\260\346\215\256\345\272\223.xlsx" "b/public/images/\345\205\250\347\220\203\345\234\260\345\214\272\346\225\260\346\215\256\345\272\223.xlsx" new file mode 100644 index 0000000000000000000000000000000000000000..67aeff4f021ed289b49624487dea6de43fa790e4 Binary files /dev/null and "b/public/images/\345\205\250\347\220\203\345\234\260\345\214\272\346\225\260\346\215\256\345\272\223.xlsx" differ diff --git "a/public/images/\346\273\264\346\273\264\345\274\200\346\272\220_\345\205\250\345\275\251\346\240\207\345\277\227_RGB.svg" "b/public/images/\346\273\264\346\273\264\345\274\200\346\272\220_\345\205\250\345\275\251\346\240\207\345\277\227_RGB.svg" new file mode 100644 index 0000000000000000000000000000000000000000..455f620b5cbc0c8cf8af7093056917bb2f4ccca1 --- /dev/null +++ "b/public/images/\346\273\264\346\273\264\345\274\200\346\272\220_\345\205\250\345\275\251\346\240\207\345\277\227_RGB.svg" @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + diff --git "a/public/images/\346\273\264\346\273\264\347\224\265\345\255\220\345\217\221\347\245\250-liwen.pdf" "b/public/images/\346\273\264\346\273\264\347\224\265\345\255\220\345\217\221\347\245\250-liwen.pdf" new file mode 100644 index 0000000000000000000000000000000000000000..4d30c6e2af676ad6bcd34a3ead37a7e5edbf69dd Binary files /dev/null and "b/public/images/\346\273\264\346\273\264\347\224\265\345\255\220\345\217\221\347\245\250-liwen.pdf" differ diff --git "a/public/images/\347\273\204\347\273\207.png" "b/public/images/\347\273\204\347\273\207.png" new file mode 100644 index 0000000000000000000000000000000000000000..4c50ef0e84a928a386f8a4793b28dd54ba38cc8d Binary files /dev/null and "b/public/images/\347\273\204\347\273\207.png" differ diff --git "a/public/images/\347\273\204\347\273\207\346\224\271\347\211\210\351\241\265\351\235\242\351\242\204\350\247\210.docx" "b/public/images/\347\273\204\347\273\207\346\224\271\347\211\210\351\241\265\351\235\242\351\242\204\350\247\210.docx" new file mode 100644 index 0000000000000000000000000000000000000000..3aa28008adb4fce118d505c5e57d2854e54b0aff Binary files /dev/null and "b/public/images/\347\273\204\347\273\207\346\224\271\347\211\210\351\241\265\351\235\242\351\242\204\350\247\210.docx" differ diff --git "a/public/images/\351\242\204\350\247\210.jpg" "b/public/images/\351\242\204\350\247\210.jpg" new file mode 100644 index 0000000000000000000000000000000000000000..e1fcfda250f32e29f80ad2d911fe46e54ce4f0d1 Binary files /dev/null and "b/public/images/\351\242\204\350\247\210.jpg" differ diff --git a/test/models/note_test.rb b/test/models/note_test.rb new file mode 100644 index 0000000000000000000000000000000000000000..7bbab537003f7d629047a679e17bdbf79d2388a0 --- /dev/null +++ b/test/models/note_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class NoteTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end