Commit Graph

86 Commits

Author SHA1 Message Date
huang dc41da89c4 针对某些项目进行测试 2018-06-07 17:14:53 +08:00
huang edd777aacc pull request的时候启动jenkins尺寸集成sonar分析 2018-06-07 16:39:09 +08:00
daiao 8a38e379ad 封装,优化本周代码 2017-01-13 10:14:10 +08:00
daiao 3126d8312f 优化pullrequest代码 2017-01-11 09:27:37 +08:00
daiao 84a0c1d7b7 将pulrequest放入小铃铛消息并加入到待审批消息;调整贴吧样式,及其个人主页头部样式 2017-01-10 14:22:27 +08:00
daiao 4f2bd2dc31 还原pullrequest小铃铛消息 2017-01-06 12:15:46 +08:00
daiao 602870069f 将pullrequest消息放入小铃铛内 2017-01-05 13:35:19 +08:00
huang c477d15fae Merge branch 'dev_newproject' into develop 2016-12-16 16:13:26 +08:00
huang 6e83d41ea4 pull request留言权限控制,非项目成员不能提交评论 2016-12-15 17:12:41 +08:00
huang 5527adb795 版本406异常处理,pull request 冲突接受后406异常提醒 2016-12-15 17:03:59 +08:00
huang 79fc4b7752 Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into dai_ao
Conflicts:
	Gemfile
	app/controllers/pull_requests_controller.rb
2016-12-15 09:26:24 +08:00
huang 7baa5be7ee pull request总数获取方式修改,列表页面添加相应的分页 2016-12-02 20:00:15 +08:00
daiao b48fc7ba3b pullrequest发送消息 2016-12-02 16:18:31 +08:00
huang 4acb674d43 pull request 发送消息代码重构,封装 2016-12-02 14:42:52 +08:00
daiao 77f252b538 Merge branch 'develop' into dai_ao
Conflicts:
	app/controllers/pull_requests_controller.rb
	app/views/users/_user_message_course.html.erb
	app/views/users/_user_message_forge.html.erb
2016-12-02 13:26:41 +08:00
daiao 51b630666f 还原pullrequest注释的代码 2016-12-02 13:20:46 +08:00
daiao 2e5cd96bb9 pullrequest发送消息 2016-12-01 11:31:48 +08:00
huang dbc8c5811a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
	app/controllers/pull_requests_controller.rb
2016-11-30 09:55:45 +08:00
huang 934b219454 pull request创建的一些改进 2016-11-30 09:52:59 +08:00
huang 5e5fa40656 pull request提醒抛出转换 2016-11-30 09:51:24 +08:00
huang 6725d122f8 Merge branch 'develop' into dai_ao
Conflicts:
	app/controllers/pull_requests_controller.rb
2016-11-30 09:42:29 +08:00
huang 9fa4b5613a pullrequest发送消息 2016-11-30 08:37:56 +08:00
huang a19f6ffd38 项目文件历史记录显示内容区分历史新增和删除
项目变更文件高亮显示
2016-11-29 17:05:14 +08:00
daiao ea30873665 创建,或关闭PullRequest时,发送消息(未完) 2016-11-29 17:02:36 +08:00
daiao b2de81394e 项目PullRequest列表,显示创建者的名字 2016-11-29 14:44:28 +08:00
daiao e7b2b1edfa Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
	app/controllers/pull_requests_controller.rb
2016-11-29 12:28:31 +08:00
daiao 43cd4f55ac Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
	app/controllers/pull_requests_controller.rb
2016-11-29 12:27:40 +08:00
daiao e4d43cc163 项目pull request 项目消息框架搭建 2016-11-29 12:25:15 +08:00
daiao 7ea9f00054 pull request 改动对比显示 代码封装 2016-11-29 10:52:57 +08:00
huang 6d14353ef7 commit_diff 2016-11-28 15:25:26 +08:00
huang 5601ae0f54 pull request的一些提示改进 2016-11-28 12:18:03 +08:00
huang 99ac546782 Merge branch 'develop' of https://git.trustie.net/Hjqreturn/trustieforge into develop 2016-11-25 20:14:02 +08:00
huang 8318bced7f pull request添加权限控制 2016-11-25 20:13:37 +08:00
huang 21b13e33ce pull request的时候各种异常类型打印 2016-11-25 19:05:37 +08:00
daiao bff5a36577 pull request各种情况给出提示 项目顶头的fork信息弹出新页面及鼠标经过手型效果 2016-11-25 11:32:45 +08:00
huang 58790bcb72 版本库删除数据一致性 解决Gitlab本身bug,删除操作会报异常的问题 2016-11-25 10:31:03 +08:00
huang 45bbd7b293 pull request 选择项目的时候JS控制分支 2016-11-24 14:47:02 +08:00
daiao 980ae78185 修改pull request发送源项目提示 2016-11-24 10:11:59 +08:00
huang fca68c24dc pull_request合并到源项目的问题 2016-11-22 15:05:33 +08:00
huang 79b1cdcf84 pull request 源项目拉取代码及提交 2016-11-22 11:06:18 +08:00
huang 6584cd88f1 pull request 使用优化 2016-11-18 16:08:50 +08:00
huang 00d12fdeb3 pull reqeust相关 2016-11-17 17:30:15 +08:00
huang 386b41d08e pull requst优化 2016-11-17 11:32:39 +08:00
huang 3699ddd398 pull request统计数显示所有 2016-10-28 15:47:05 +08:00
huang 7035dab4ce pull request 提交动态按天排序 2016-10-26 15:40:44 +08:00
huang 5eb82de6e0 pull request权限判断 2016-10-26 13:45:15 +08:00
huang 187a96b251 pull request评论局部刷新及样式 2016-10-25 15:34:32 +08:00
huang db50d32f78 二级回复样式 2016-10-24 11:33:06 +08:00
huang 0760836f29 项目base优化 2016-10-14 17:23:51 +08:00
huang 17743457e1 项目menu导航 2016-10-10 10:41:41 +08:00