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 |
Alexander Machehin
|
e9dec9192f
|
#944 fix error with branches list
|
2013-02-22 01:24:20 +06:00 |
Alexander Machehin
|
2ba37b5da4
|
#944 fix showing empty project
|
2013-02-22 01:23:45 +06:00 |
Vokhmin Alexey V
|
7bcbe39e61
|
#907: update "FileStoreClean" module, some refactoring
|
2013-02-15 01:49:18 +04:00 |
Vokhmin Alexey V
|
c6aa58c063
|
Merge branch 'master' into 907-save-project-tags-on-file-store
|
2013-02-14 17:15:16 +04:00 |
Vokhmin Alexey V
|
5c286a6aa0
|
#907: add ProjectTags table, update UI, logic
|
2013-02-14 16:46:25 +04:00 |
Alexander Machehin
|
934cb8fbb8
|
[refs #907] fixed 404 in branch with dots
|
2013-02-14 12:55:56 +06:00 |
Vokhmin Alexey V
|
7fc8e33993
|
#907: small refactoring of UI
|
2013-02-13 23:29:08 +04:00 |
Vokhmin Alexey V
|
58ac925368
|
#907: refactoring #tags && #branches views
|
2013-02-13 21:40:16 +04:00 |
Vokhmin Alexey V
|
2a3fb08a89
|
#907: "skip_before_filter authenticate_user!" for #tags and #branche
|
2013-02-13 15:42:24 +04:00 |
Vokhmin Alexey V
|
f97fb4c4a5
|
#907: show only tags with commit
|
2013-02-13 15:38:25 +04:00 |
Vokhmin Alexey V
|
c762d2b6e0
|
#907: update #tags action
|
2013-02-13 15:23:58 +04:00 |
Vokhmin Alexey V
|
3929c4bb57
|
#907: update #branches UI
|
2013-02-13 14:25:09 +04:00 |
Vokhmin Alexey V
|
77d3a01614
|
#907: add #branches, #tags actions
|
2013-02-12 20:35:14 +04:00 |
Alexander Machehin
|
7185a46ed7
|
[refs #878] fixed ActionController::RoutingError (Not Found) for archives
|
2013-01-31 23:26:41 +06:00 |
Alexander Machehin
|
8860238da4
|
[refs #878] fix some bugs when no master branch
|
2013-01-31 22:26:49 +06:00 |
Alexander Machehin
|
3432b6af49
|
[refs #674] change comments
|
2012-12-04 00:06:31 +06:00 |
Alexander Machehin
|
611402c4c2
|
[refs #674] add stats
|
2012-12-03 17:11:55 +06:00 |
Alexander Machehin
|
8ed71e0f03
|
[refs #674] fixed undefined method 'binary?' for nil:NilClass when rename the file
|
2012-11-27 23:35:58 +06:00 |
Alexander Machehin
|
7be2df7578
|
[refs #674] first step of the diff between commits
|
2012-11-20 01:15:15 +06:00 |
Alexander Machehin
|
95e5804358
|
[refs #90] fixed git timeout error on the big diff
|
2012-10-26 20:03:46 +06:00 |
Alexander Machehin
|
b9d69a966b
|
[refs #579] add 404 for wrong commit hash
|
2012-10-13 01:59:14 +06:00 |
Alexander Machehin
|
c5d6707b8f
|
[refs #579] fixed commit comments errors
|
2012-10-13 01:57:54 +06:00 |
Alexander Machehin
|
ed7aec602f
|
[refs #579] alpha version of the pull inline comments
|
2012-10-06 01:19:05 +06:00 |
Alexander Machehin
|
e085784d51
|
Merge branch 'master' into 579-code_line_comments
Conflicts:
app/assets/stylesheets/design/custom.scss
app/helpers/diff_helper.rb
app/models/ability.rb
app/views/projects/comments/_list.html.haml
app/views/projects/git/commits/_commit_diff.html.haml
lib/ext/git/inline_callback.rb
|
2012-10-05 15:32:29 +06:00 |
Alexander Machehin
|
527dd210bf
|
[refs #579] alpha version of inline comments for commit
|
2012-10-05 00:40:12 +06:00 |