Commit Graph

129 Commits

Author SHA1 Message Date
Tim 1db5064486 新的合并请求样式调整 2016-10-08 17:37:41 +08:00
Tim 6e93b0dc0d 项目去掉右侧白色块后,样式调整 2016-10-08 17:08:07 +08:00
Tim 858348298b 项目加载慢时,有白色块显示bug修复 2016-09-29 14:24:42 +08:00
huang 0c221abd61 PULL REQUEST 默认情况下不显示 2016-08-31 09:18:05 +08:00
huang 69301a1120 Pull reques登录提示(权限控制) 2016-08-25 10:04:51 +08:00
huang 3ce088002a 留言和已关闭流程修改 2016-08-13 16:53:56 +08:00
huang 8eaeea299a 相同分支和项目消息JS提示 2016-08-11 15:19:58 +08:00
huang 3df8a46634 PUll request代码简化及reverse评论 2016-08-11 14:16:13 +08:00
huang 41ad5ca444 修改Gitlab接口返回创建时间 2016-08-11 11:11:49 +08:00
huang b046f24b44 合并信息提交 2016-08-10 16:54:58 +08:00
huang 98a8702ba6 记录谁合并的pull request请求 2016-08-10 16:49:48 +08:00
huang 5ad063b830 记录接受PR用户信息,并且唯一性判断 2016-08-10 16:27:41 +08:00
huang 4f3b41f323 详情页面提供分页(评论、变更、提交) 2016-08-09 16:11:49 +08:00
huang 867434531d pull request 列表页面添加分页 2016-08-09 15:28:06 +08:00
huang 87c5f50545 PULL request 评论创建及局部刷新 2016-08-09 14:51:48 +08:00
huang b7bccc7d22 PR添加评论 列表页面 2016-08-09 14:00:36 +08:00
Tim 5838e8f810 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-09 10:45:33 +08:00
Tim 5dd6244a34 pull request添加留言 2016-08-09 10:45:14 +08:00
huang d1b4e83fee 完成pull request 关闭功能 2016-08-09 10:29:18 +08:00
huang 26c11693fd Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-08 15:24:27 +08:00
huang 518d6bacbe 添加关闭pull request功能 2016-08-08 15:23:55 +08:00
huang ecc6f5601e 接受请求后显示admin问题 2016-08-05 20:14:19 +08:00
huang 2bdf3d573b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 19:45:06 +08:00
huang 20fac3852d 合并信息 2016-08-05 19:44:52 +08:00
Tim 0200590a70 待处理合并无更新内容时,页尾显示偏移bug 2016-08-05 18:42:14 +08:00
huang 910fe0f48c css 2016-08-05 18:23:03 +08:00
huang a46aba1491 样式调整 2016-08-05 18:12:08 +08:00
huang 7c484b4f4a 页面显示问题 2016-08-05 18:00:10 +08:00
Tim 920e470f6d pull request列表省略号显示 2016-08-05 17:51:39 +08:00
huang af7e507279 合并权限 2016-08-05 16:42:06 +08:00
huang 43a4e0a2bf fork成功不跳转提示 2016-08-05 15:23:52 +08:00
huang b62ac02c15 自身分支创建PR修改 2016-08-05 14:19:09 +08:00
huang 4ec8cc9a50 PR新建相关功能完善 2016-08-05 11:19:36 +08:00
huang b86b2299a7 fork分支选择 js 2016-08-05 11:10:39 +08:00
huang b297446778 select选择框 2016-08-05 10:42:06 +08:00
huang ab6acb460e forke项目发送pull request API 2016-08-04 19:32:44 +08:00
huang f4bda16469 fork分支PR 2016-08-04 18:30:04 +08:00
huang 5419103268 修改API(gitlab中创建所有pullrequest为Admin的问题) 2016-08-04 17:01:19 +08:00
huang 99fa39371d 接受请求ajax刷新 2016-08-04 15:36:02 +08:00
huang 9eb084c3bd Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
	app/views/pull_requests/_show.html.erb
2016-08-04 15:08:05 +08:00
huang 515649beb6 接受PR局部刷新及跳转 2016-08-04 15:07:15 +08:00
Tim 33467d3152 已处理页面样式;新建时选择项目刷新分支js 2016-08-04 15:04:27 +08:00
huang 54a9fadbd1 判断合并和未合并的pr 2016-08-04 14:24:32 +08:00
huang 362e95d103 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-04 14:11:53 +08:00
huang 7084a3fed9 新建pull request的时候JS控制标题不能为空 2016-08-04 14:11:24 +08:00
Tim 6f1b7f827e Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-04 14:05:07 +08:00
Tim b8a40862ce 改变行代码格式化,不折行 2016-08-04 14:04:55 +08:00
huang 1f5c4a800f 代码没有改动时候提示 2016-08-04 11:35:04 +08:00
huang 0b3e1f558c Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
	app/views/pull_requests/show.html.erb
2016-08-04 11:15:38 +08:00
huang 21747d02a2 新建PR成功后JS跳转HTML跳转,相关页面局部刷新,及错误提示 2016-08-04 11:13:31 +08:00
Tim f444d6fab0 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
	app/views/pull_requests/_form.html.erb
2016-08-04 10:46:18 +08:00
Tim cedff021ad 分支下拉框样式;改动样式;无合并内容提示 2016-08-04 10:44:48 +08:00
huang a62ede1a33 先建pull request及局部刷新 2016-08-04 10:08:13 +08:00
huang 2e91da4f28 项目分支获取 2016-08-03 17:37:37 +08:00
huang c20b679c22 PR new调整 2016-08-03 17:04:02 +08:00
huang f8b53b8dfc Pull request列表页面分类 2016-08-03 16:54:37 +08:00
huang 9f9eed2e27 隐藏编辑功能 2016-08-03 16:05:29 +08:00
huang 22a8adb64e 添加统计数目 2016-08-03 16:02:42 +08:00
huang b8cccdffda 完成changes数据获取及展示 2016-08-03 15:56:07 +08:00
huang 8e329db4d8 pull request commits样式调整 2016-08-03 15:16:28 +08:00
huang 27e755a0a9 数据获取及展示 2016-08-03 15:06:10 +08:00
huang 0a9224d036 每次请求提交的代码 2016-08-03 14:43:27 +08:00
huang be081f5c66 添加Api(提交内容,改动)及相关方法路由 2016-08-03 13:57:59 +08:00
huang 1cb6809bdf Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
	app/views/pull_requests/new.html.erb
2016-08-03 11:09:14 +08:00
huang 182c861b30 创建pull request 2016-08-03 11:07:49 +08:00
Tim e7fa38e52c pull request show页面 2016-08-03 11:00:31 +08:00
huang 5e9c27b63d 代码封装 2016-08-02 16:38:56 +08:00
Tim b91bb1f0d2 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:37:41 +08:00
Tim c8dce2c2fc 请求处理页面 2016-08-02 16:37:30 +08:00
huang 56a444dac0 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:34:31 +08:00
huang 3ce1ac80b4 pull_request ---> new 2016-08-02 16:34:20 +08:00
Tim 09f25588a8 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-08-02 16:10:34 +08:00
Tim 7e440596ab 新建请求,js效果 2016-08-02 16:10:25 +08:00
huang 20bdd23665 pull requtst show 2016-08-02 16:06:51 +08:00
huang d286d3fe06 pullrequest头部 2016-08-02 15:44:25 +08:00
Tim 3e95b070d0 合并请求代码 2016-08-02 15:00:05 +08:00
Tim 9af8757ceb 项目合并请求 2016-08-02 10:03:42 +08:00
Tim 1fc617d5fa pull request页面删除 2016-08-01 16:57:55 +08:00
huang b718803bd9 修改控制器名称及控制器查询访问权限 2016-08-01 16:54:31 +08:00