Alexander Machehin
|
49cbad5b6e
|
fix ArgumentError: wrong number of arguments (2 for 1)
|
2014-09-12 16:47:39 +06:00 |
Alexander Machehin
|
dd41f41867
|
[#369] add codemirror editor
|
2014-04-16 21:56:24 +06:00 |
Alexander Machehin
|
fc4ad9ac0a
|
[#345] owner_and_name -> name_with_owner
|
2014-03-26 01:18:42 +06:00 |
Alexander Machehin
|
718c8bb08c
|
[#345] remove url_for hack
|
2014-03-13 22:35:00 +06:00 |
Alexander Machehin
|
d836cbe259
|
[#345] fix url_for
|
2014-03-11 15:56:34 +06:00 |
Alexander Machehin
|
0e39aae1bf
|
[#343] use new ruby hash syntax
|
2014-01-21 10:51:49 +06:00 |
Alexander Machehin
|
bbc710d33f
|
[#29] try to fix invalid byte sequence in UTF-8
|
2014-01-17 02:06:54 +06:00 |
Vokhmin Alexey V
|
015c0375e8
|
#29: updated gems, remove old code
|
2014-01-15 23:34:54 +04: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 |
Vokhmin Alexey V
|
935cda4a0a
|
#251: updated pagination, some refactoring
|
2013-08-05 16:34:01 +04:00 |
Vokhmin Alexey V
|
48e0998b93
|
#175: revert changes, added #binary? method to Grit::Submodule
|
2013-06-10 21:58:43 +04:00 |
Alexander Machehin
|
0fafc00b82
|
small rtruncate refactoring
|
2013-06-05 15:26:58 +06:00 |
Alexander Machehin
|
8ebf36dcb8
|
fix truncating filename at pull request diff page
|
2013-06-05 10:36:56 +06:00 |
Alexander Machehin
|
af51f67b64
|
reorder reserved names
|
2013-05-06 23:50:16 +06:00 |
Alexander Machehin
|
e342c9a589
|
add more reserved names: upload,uploads,download
|
2013-05-06 23:42:00 +06:00 |
warpc
|
0f95623470
|
Merge pull request #57 from abf/rosa-build:30-social-login-and-open-registration
[refs #30]: Social login and open registration
|
2013-04-10 16:52:50 +04:00 |
Alexander Machehin
|
febff6a0b8
|
[#42] add reserved name "none" & fix sorting
|
2013-04-08 15:33:48 +06:00 |
Vokhmin Alexey V
|
9e7eb7af94
|
#29: merge master into branch
|
2013-04-03 16:10:22 +04:00 |
Vokhmin Alexey V
|
c2e89f8781
|
#30: use omniauth for registration through Facebook, GitHub, Google
|
2013-03-26 03:13:15 +04:00 |
Vokhmin Alexey V
|
1574595cab
|
Fix: undefined method 'touch' for Grit::Commit
|
2013-03-21 22:37:22 +04:00 |
Vokhmin Alexey V
|
e055d0080b
|
#29: removed hack for encoding
|
2013-03-18 15:36:16 +04: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
|
694037af7e
|
[refs #579] remove unused lib
|
2012-10-08 20:47:03 +06:00 |
Alexander Machehin
|
2360a25a42
|
[refs #579] fixed many errors
|
2012-10-05 17:02:25 +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 |
Alexander Machehin
|
ccb004bc03
|
Merge branch 'master' into 579-code_line_comments
Conflicts:
app/assets/stylesheets/design/custom.scss
|
2012-09-26 16:27:46 +06:00 |
Alexander Machehin
|
910aac939e
|
[refs #90] fixed changing tabs & anchors
|
2012-08-08 21:47:58 +06:00 |
Alexander Machehin
|
6a04f4ad7a
|
Merge again branch 'master' into 90-pull
Conflicts:
db/schema.rb
|
2012-08-06 11:19:06 +06:00 |
Pavel Chipiga
|
33d722b779
|
Fix branch_or_tag parse constraint, minor refactor. Refs #263
|
2012-08-02 17:54:34 +03:00 |
Alexander Machehin
|
b299a51610
|
Merge branch 'master' into 90-pull
Conflicts:
db/schema.rb
|
2012-08-01 13:06:41 +06:00 |
Pavel Chipiga
|
8e91159b5b
|
Improve and refacror huge blob display. Fix wiki create and display. Fix build_lists test. Refs #263
|
2012-07-31 20:32:49 +03:00 |
Pavel Chipiga
|
01a3572de0
|
Minor update. Fix helper bug. Minor refactor. Refs #263
|
2012-07-31 17:35:18 +03:00 |
Alexander Machehin
|
6c11597de6
|
Merge branch 'master' into 90-pull
|
2012-07-30 16:53:59 +06:00 |
Pavel Chipiga
|
27030566a4
|
Update rails, grit, gollum. Fix re-encoding bug. Refs #263
|
2012-07-30 02:32:23 +03:00 |
Alexander Machehin
|
944c6fc0e2
|
Merge branch 'master' into 90-pull
Conflicts:
app/assets/stylesheets/design/custom.scss
app/controllers/projects/git/commits_controller.rb
app/helpers/git_helper.rb
app/models/project.rb
app/views/projects/git/commits/_commit_diff.html.haml
db/schema.rb
lib/ext/core/string.rb
|
2012-07-27 18:37:25 +06:00 |
Pavel Chipiga
|
b476f7248c
|
Minor refactor. Refs #263
|
2012-07-27 13:47:23 +03:00 |
Pavel Chipiga
|
566cd8209b
|
Take back branches_and_repos method. Refs #263
|
2012-07-27 00:24:14 +03:00 |
Pavel Chipiga
|
35e673d44e
|
Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263
|
2012-07-27 00:15:57 +03:00 |
Alexander Machehin
|
9c4db595cb
|
[refs #579] new line comment icon
|
2012-07-25 22:24:58 +06:00 |
Alexander Machehin
|
27ad29d365
|
[refs #90] some inline callback refactoring
|
2012-07-19 22:55:23 +06:00 |
Alexander Machehin
|
35b953ac11
|
[refs #90] add commit/pull lines ref
|
2012-07-19 22:42:37 +06:00 |
Pavel Chipiga
|
611b22baa5
|
Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263
|
2012-07-17 11:02:56 +03:00 |
Alexander Machehin
|
1ffb1b3940
|
Merge branch 'master' into 90-pull
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/models/project.rb
db/schema.rb
|
2012-06-27 16:20:38 +06:00 |
Pavel Chipiga
|
ec21c042dd
|
Fix and refactor active menu. Refs #207
|
2012-06-09 19:04:06 +03:00 |
Alexander Machehin
|
5f50bacbe6
|
[refs #90] some refactoring with rtruncate method
|
2012-06-08 13:38:24 +06:00 |
Alexander Machehin
|
7a011606a5
|
[refs #443] add pirobox popup
|
2012-05-12 19:17:07 +06:00 |
Alexander Machehin
|
5f5eb00c4f
|
[refs #443] abf tour
|
2012-05-12 00:15:20 +06:00 |
Pavel Chipiga
|
5157f31081
|
Refactor routes to separate owner profile and project. Redo short groups profile URL. Improve specs. Refs #236
|
2012-05-04 00:52:56 +03:00 |