Alexander Machehin
|
c7d5ca7305
|
Merge branch 'master' into 465-use-pundit-instead-of-cancan
|
2015-04-14 19:21:42 +05:00 |
Alexander Machehin
|
a67f108572
|
always use commit.show instead diffs
|
2015-04-09 13:57:05 +05:00 |
Vokhmin Alexey V
|
86bfd9b8c7
|
#465: cleanup
|
2015-04-07 23:14:28 +03:00 |
Vokhmin Alexey V
|
3146a27f47
|
#465: Update specs for Projects::Git::TreesController
|
2015-04-07 23:14: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 |
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 |
Vokhmin Alexey V
|
84e7145d6d
|
rename *_filter => *_action
|
2015-03-05 02:19:19 +03:00 |
Vokhmin Alexey V
|
5e5d3905e4
|
Update rails to 4.1.9
|
2015-03-05 02:09:50 +03:00 |
Vokhmin Alexey V
|
13cd263855
|
#456: add integration with Group#default_branch, specs
|
2015-02-20 01:03:04 +03:00 |
Vokhmin Alexey V
|
362477fadd
|
#369: remove layouts/application.html.haml
|
2014-11-14 00:41:07 +03:00 |
Alexander Machehin
|
27f3d371a6
|
[#369] blob; hightlight a line;
|
2014-11-10 23:46:44 +05:00 |
Alexander Machehin
|
202ac91644
|
[#369] change location in the tree page
|
2014-07-11 15:43:45 +06:00 |
Alexander Machehin
|
3bbf6b54f2
|
[#369] tags page
|
2014-07-10 21:47:15 +06:00 |
Alexander Machehin
|
3b7bfb0c1d
|
[#369] branches page
|
2014-07-10 21:13:23 +06:00 |
Alexander Machehin
|
0c1d0fc133
|
[#369] commits index page
|
2014-07-09 22:29:15 +06:00 |
Alexander Machehin
|
388617c248
|
[#369] git tree page
|
2014-07-08 20:52:10 +06:00 |
Alexander Machehin
|
33790f884c
|
[#369] small improvements; project page
|
2014-07-01 20:52:52 +06:00 |
Vokhmin Alexey V
|
518c87994c
|
refactoring according to Alexander's comments
|
2014-05-05 18:50:12 +04:00 |
Vokhmin Alexey V
|
acc9b522db
|
Use FileStore for build scripts
|
2014-05-03 00:38:28 +04:00 |
Vokhmin Alexey V
|
7842f72eb3
|
Fixed: Access violation to this page
|
2014-04-08 17:00:39 +04:00 |
Alexander Machehin
|
a5f56bb835
|
[#345] remove observers; use new labmda syntax
|
2014-03-11 14:28:17 +06:00 |
Alexander Machehin
|
0e39aae1bf
|
[#343] use new ruby hash syntax
|
2014-01-21 10:51:49 +06:00 |
Alexander Machehin
|
0cb585ef71
|
Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
Gemfile
Gemfile.lock
app/controllers/activity_feeds_controller.rb
app/models/activity_feed_observer.rb
config/environments/development.rb
config/initializers/a_app_config.rb
config/initializers/airbrake.rb
lib/modules/models/git.rb
spec/controllers/activity_feeds_controller_spec.rb
spec/helpers/activity_feeds_helper_spec.rb
|
2014-01-10 08:31:31 +06:00 |
Alexander Machehin
|
fbc00071b9
|
fix missing template
|
2013-10-02 20:21:16 +06:00 |
Vokhmin Alexey V
|
a098e00a1a
|
Merge branch 'master' into 226-remove-API-calls-from-JS
Conflicts:
app/assets/javascripts/angularjs/controllers/project_refs_controller.js
config/routes.rb
|
2013-07-23 19:23:20 +04:00 |
Vokhmin Alexey V
|
c9b7f890fa
|
#222: removed #restore_branch method
|
2013-07-23 17:29:41 +04:00 |
Vokhmin Alexey V
|
eb4d4806f4
|
#226: updated Branches and Tags views, JS, etc.
|
2013-07-23 14:07:39 +04:00 |
Vokhmin Alexey V
|
079f8a955a
|
#222: init GitHook on creating branch from UI
|
2013-07-22 18:21:12 +04:00 |
Vokhmin Alexey V
|
6f67b580c4
|
#222: added form for creating new branch
|
2013-07-22 15:27:14 +04:00 |
Vokhmin Alexey V
|
1fb472d416
|
#214: refactoring of Tree#destroy action according to Alexander's comments
|
2013-07-19 14:22:29 +04:00 |
Vokhmin Alexey V
|
7880fa4625
|
#214: added specs for Project #restore_branch && #delete_branch
|
2013-07-15 17:52:13 +04:00 |
Vokhmin Alexey V
|
2b423e6a6e
|
#214: some refactoring of JS, added comments
|
2013-07-15 16:09:31 +04:00 |
Vokhmin Alexey V
|
a8f4648a08
|
#214: added skip_authorize_resource for TreeController
|
2013-07-13 00:30:02 +04:00 |
Vokhmin Alexey V
|
fe8e1216c5
|
#214: remove unnecessary code
|
2013-07-12 23:27:49 +04:00 |
Vokhmin Alexey V
|
ffcdd26c66
|
#214: updated UI of PullRequest#show
|
2013-07-12 18:21:46 +04:00 |
Vokhmin Alexey V
|
e096fc1bde
|
#214: updated logic of deleting of branch
|
2013-07-11 17:50:22 +04:00 |
Vokhmin Alexey V
|
2e33f0038a
|
#214: added ability to destroy branch
|
2013-07-11 17:03:02 +04:00 |
Vokhmin Alexey V
|
ddbaffdb13
|
#214: removed unnecessary code
|
2013-07-11 14:37:02 +04:00 |
Vokhmin Alexey V
|
d747ffd070
|
#214: updated #branches page, integrated AngularJS
|
2013-07-11 14:34:44 +04:00 |
Vokhmin Alexey V
|
9f80f662a5
|
#173: redirect to #tree_path when blob is tree
|
2013-06-10 20:44:57 +04:00 |
Vokhmin Alexey V
|
e055d0080b
|
#29: removed hack for encoding
|
2013-03-18 15:36:16 +04:00 |
Alexander Machehin
|
ab703ffa4f
|
#959 fix did you run git update-server-info on the server?
|
2013-02-25 20:35:39 +06:00 |
Alexander Machehin
|
836a030438
|
fixing errors with wrong branch (again) #944
|
2013-02-22 14:54:04 +06:00 |
Alexander Machehin
|
e08c31e314
|
#944 refactoring checking empty project
|
2013-02-22 13:22:34 +06:00 |
Alexander Machehin
|
71de1477b3
|
#944 fix check empty repository
|
2013-02-22 13:17:00 +06:00 |
Alexander Machehin
|
750131ae74
|
#944 show no branches on empty project
|
2013-02-22 01:59:02 +06:00 |