Commit Graph

2338 Commits

Author SHA1 Message Date
Alexander Machehin c7d5ca7305 Merge branch 'master' into 465-use-pundit-instead-of-cancan 2015-04-14 19:21:42 +05:00
Alexander Machehin a3391cc376 fix pull request commits path 2015-04-14 19:18:32 +05:00
Alexander Machehin 328eef6ea2 #465 fix subscribes; add/fix subscribe specs 2015-04-14 16:06:44 +05:00
Alexander Machehin 22cec1be6e Fix creating a comment in Firefox; add flash-messages 2015-04-10 16:50:14 +05:00
Alexander Machehin f89e73ea0e commit diff: fix error with submodule 2015-04-10 14:37:26 +05:00
Alexander Machehin 585b8b2f47 fix error with undefined method 'id' for nil:NilClass 2015-04-09 22:12:21 +05:00
Alexander Machehin 2c5f8ee065 update file_blob_in_diff method 2015-04-09 21:33:33 +05:00
Alexander Machehin 6f690f4586 diff: remove -M option 2015-04-08 19:24:40 +05:00
Vokhmin Alexey V 60a97a44e2 #465: Update specs for Groups::*Controller 2015-04-07 23:09:11 +03:00
Vokhmin Alexey V becedf0534 #465: updated Api::V1::AdvisoriesController, specs 2015-04-07 23:08:15 +03:00
Vokhmin Alexey V e829d35a89 #465: Added XxxPolicy classes for all models. 2015-04-07 23:07:07 +03:00
Vokhmin Alexey V de442480da #465: updated RepositoryPolicy 2015-04-07 23:06:27 +03:00
Vokhmin Alexey V 5c7608ee4e #465: added #local_admin_manage? policy 2015-04-07 23:06:27 +03:00
Vokhmin Alexey V 92f7efed34 #465: Updated some controllers, logic of polices 2015-04-07 23:06:27 +03:00
Vokhmin Alexey V fe2110902b #465: updated ProjectPolicy 2015-04-07 23:05:12 +03:00
Vokhmin Alexey V 6a7d6cb982 #465: updated views 2015-04-07 23:05:12 +03:00
Vokhmin Alexey V 4fec2213c8 #465: added pundit gem, wip... 2015-04-07 23:01:25 +03:00
Alexander Machehin 734cd49237 new pull diff 2015-04-07 22:14:18 +05:00
Alexander Machehin 2ec7a8bb91 new diff 2015-04-07 20:53:29 +05:00
Alexander Machehin d062e9a330 new commit diff 2015-04-07 19:16:04 +05:00
Alexander Machehin f202d1d449 new diff; in progress 2015-04-06 22:44:37 +05:00
Alexander Machehin 7669ea33f9 update the project collaborators page 2015-04-03 20:08:17 +05:00
Alexander Machehin e5deae8fdd fix error with regenerate params 2015-04-02 19:54:13 +05:00
Alexander Machehin 9870cfaa83 fix rendering projects/git/commits#diff; add shevrons to the diffs panel-heading 2015-04-01 16:49:43 +05:00
Alexander Machehin d2a30e2169 pull request: fix showing the closed time 2015-03-30 14:25:50 +05:00
Alexander Machehin bc9ebf46df update build list log view 2015-03-27 16:18:15 +05:00
Alexander Machehin 3540b95127 project collaborators page: fix error with empty collaborator 2015-03-26 20:31:20 +05:00
Alexander Machehin 6346c65939 commit page: fix error with too big commit 2015-03-26 16:56:29 +05:00
Alexander Machehin b907636603 git tree page: fix mistype 2015-03-26 16:46:42 +05:00
Alexander Machehin 90a4d47bfb product build lists page: update server status & fix a status filter 2015-03-23 16:14:50 +05:00
Alexander Machehin 69d7bb37a4 fix showing a pull request statuses 2015-03-23 14:58:39 +05:00
Alexander Machehin ea32cf3685 dont reload page after removing a project from repository 2015-03-20 15:26:10 +05:00
Alexander Machehin dabab0561d use rails-assets-notifyjs gem from rails-assets.org 2015-03-20 15:07:35 +05:00
Alexander Machehin 5c8c6ed196 repository projects: ajax remove project + flash 2015-03-19 22:24:54 +05:00
Alexander Machehin 0911103ea1 show server status only on index pages 2015-03-18 20:54:07 +05:00
Alexander Machehin 10c28be905 add comments to commit 2015-03-18 20:49:10 +05:00
Alexander Machehin ed00ea0752 project build lists page: fix mistype 2015-03-18 20:37:36 +05:00
Alexander Machehin e8d1594b80 update server status again 2015-03-18 19:58:25 +05:00
Alexander Machehin b4319f6a84 update server status 2015-03-18 19:51:25 +05:00
Alexander Machehin 7a7844b423 show a server status only on the index page 2015-03-18 16:41:37 +05:00
Alexander Machehin eac252829f Merge branch 'master' into improve_monitoring_page 2015-03-18 16:30:31 +05:00
Alexander Machehin 691d74a8dd change a server status rendering 2015-03-18 16:29:26 +05:00
Alexander Machehin be43b4a379 user/group profile page: fix dropdown menu 2015-03-18 16:04:37 +05:00
Alexander Machehin ad01754ebf monitoring page: fix DatePicker 2015-03-18 15:34:16 +05:00
Alexander Machehin 9d27cbb625 Merge branch 'master' of abf.rosalinux.ru:abf/rosa-build 2015-03-17 23:27:56 +05:00
Alexander Machehin 2175a898be fix preview 2015-03-17 23:27:11 +05:00
Alexander Machehin e726eb842f [#369] improve the monitoring page 2015-03-17 22:43:03 +05:00
Vokhmin Alexey V 35cf06d403 Fixed: showing of flash messages 2015-03-12 22:36:13 +03:00
Vokhmin Alexey V d6234ae758 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/controllers/projects/git/trees_controller.rb
2015-03-06 00:53:44 +03:00
Alexander Machehin 9f53a384db [#369] dont redirect to project if get an ajax request 2015-03-05 10:57:28 +05:00