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
|
a673f6ed56
|
add time ago
|
2013-09-01 18:06:42 +06:00 |
Vokhmin Alexey V
|
e055d0080b
|
#29: removed hack for encoding
|
2013-03-18 15:36:16 +04:00 |
Pavel Chipiga
|
89f31e9782
|
Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190
|
2012-03-21 21:55:14 +02:00 |
|
Pavel Chipiga
|
7308c4a0d2
|
Merge branch '3.2-master' into 255-search
Refactor avatars. Fix user bugs. Remove ssh_key delete migration
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/user.rb
|
2012-03-06 20:59:29 +02:00 |
konstantin.grabar
|
9b68752ffd
|
[refs #257] Change avatar helper and logic. Add paperclip avatar to users
|
2012-03-03 22:05:02 +04:00 |
George Vinogradov
|
6cfb5d0c3d
|
[issue #195] Fixed bug with encodings. Added avatar. Stubbed blame.
|
2012-03-02 04:39:43 +04:00 |
|
George Vinogradov
|
99ee490e94
|
[issue #64] Added callback for notifications + some minor changes
|
2012-02-14 03:30:17 +04:00 |
|
George Vinogradov
|
0591ba4378
|
[fix #158] Fixed bug with render in BlobController#raw
|
2012-02-04 22:03:29 +04:00 |
|
George Vinogradov
|
e05f391f8e
|
[issue #64] Write User.uname instead of User.name to commit
|
2012-02-03 04:04:20 +04:00 |
|
George Vinogradov
|
6f78e5456c
|
[issue #64] Changes for ruby 1.9.3 compatibility.
|
2012-01-31 20:40:46 +04:00 |
|
George Vinogradov
|
07e71c2dfc
|
[issue #64] Changed find_by to where
|
2012-01-31 01:20:03 +04:00 |
|
George Vinogradov
|
2a27cd3662
|
[issue #64] Some fixes.
|
2012-01-30 19:27:54 +04:00 |
|
George Vinogradov
|
706c052a5e
|
[issue #64] User names are clickable.
|
2012-01-29 22:03:42 +04:00 |
|
George Vinogradov
|
acdd1f22b6
|
[issue #64] Fixed bug with revert all wiki.
|
2012-01-28 16:10:43 +04:00 |
|
George Vinogradov
|
324e9a294f
|
[issue #64] Fixed some bugs.
|
2012-01-27 22:30:45 +04:00 |
|
George Vinogradov
|
364f2e40c0
|
[issue #64] Added Wiki history, compare, revert.
|
2012-01-20 03:25:15 +04:00 |
|
George Vinogradov
|
0c527af291
|
[issue #64] Added revisions comparsion.
|
2012-01-19 17:49:32 +04:00 |
|
George Vinogradov
|
7afcc3a617
|
[issue #64] Some fixes.
|
2012-01-18 18:33:09 +04:00 |
|
George Vinogradov
|
2522dd3c63
|
[issue #64] Added page history views.
|
2012-01-18 03:30:54 +04:00 |
|
George Vinogradov
|
1e1dab369b
|
[issue #64] Added some views, styles and scripts.
* Added base gollum styles
* Added base gollum javascripts (with minor changes)
* Fixed some bugs in WikiController
* Added some views (draft yet)
|
2012-01-17 01:48:38 +04:00 |
|
George Vinogradov
|
81378478ca
|
[issue #64] Added Wiki controller and some methods in Project
|
2011-12-26 21:07:07 +04:00 |