0e39aae1bf
[ #343 ] use new ruby hash syntax
2014-01-21 10:51:49 +06:00
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
a673f6ed56
add time ago
2013-09-01 18:06:42 +06:00
b7fb0bc619
fix find commits with leading `0` symbols
2013-04-25 21:00:30 +06:00
266ae36296
[ #19 ] fix error with undefined method `project`
2013-04-10 18:26:23 +06:00
82668412ae
[ #19 ] fix hide autocomment to the hidden project for current user
2013-04-10 16:30:53 +06:00
c8084cc618
[ #19 ] hide autocomment for user without access to the issue
2013-04-10 01:26:27 +06:00
50235207a0
[ #19 ] fixed error with outdated commit reference
2013-04-09 17:47:45 +06:00
7a6facd316
[ #19 ] small avatar refactoring
2013-04-02 21:14:32 +06:00
66f59ab685
[ #19 ] fix creating & showing comments from commit message
2013-04-02 14:35:25 +06:00
1f5f954962
[ #19 ] fixed showing comments
2013-04-01 23:24:19 +06:00
0ed81826b0
[ #19 ] fix search of the committer
2013-03-28 22:01:59 +06:00
7c9adc1d4c
[ #19 ] fix undefined method "is_reference_to_issue"
2013-03-27 19:37:55 +06:00
d737960913
[ #19 ] add issues link from comment
2013-03-26 16:47:42 +06:00
ce2ca6646e
[ #19 ] add issue references from commit
2013-03-22 22:50:13 +06:00
e055d0080b
#29 : removed hack for encoding
2013-03-18 15:36:16 +04:00
76606036cb
[refs #737 ] remove branch from commit message
2012-11-28 19:15:15 +06:00
2db7726d55
Merge branch '3.2-master' into 190-encodings
...
Conflicts:
db/schema.rb
2012-03-22 00:13:18 +02:00
65e4e0f748
[issue #195 ] use avatar_url_by_email instead of gravatar_url
2012-03-22 02:06:33 +04:00
b902d8effe
[issue #195 ] Fixed avatar in commits & comments
2012-03-22 01:51:39 +04:00
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
ba437f7703
[refs #265 ] changed activity feed messages
2012-03-14 00:47:37 +06:00
43c10ee812
[issue #195 ] Fixed long comments displaying.
2012-03-02 00:33:48 +04:00
fe5ad9ebf3
[issue #195 ] Added missed js. Some changes.
2012-03-01 05:07:31 +04:00
662ea4018c
[issue #195 ] Changed commit header on commit page.
2012-02-29 19:08:21 +04:00
19dd58800b
[issue #195 ] Added comments to commit.
2012-02-29 19:05:36 +04:00
fe46e53ad8
[issue #195 ] Many changes.
...
* Base presenter moved to lib
* Added diff display
* Changes in some views
TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
582063d066
[issue #195 ] Commits history, editing, showing...
2012-02-27 21:40:46 +04:00
6fe88ed69d
[issue #195 ] Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects
...
Conflicts:
app/presenters/git_presenters/commit_as_message_presenter.rb
2012-02-23 02:16:20 +04:00
43b7ccd3dc
[issue #195 ] Added blob show. Some changes.
2012-02-23 02:11:55 +04:00
ba1798fd71
[refs #195 ] Add design to form and edit page
2012-02-22 21:48:37 +04:00
328cd17f46
[issue #195 ] Fixed bug in CommitPresenter
2012-02-21 19:51:48 +04:00
85f3d956f5
[issue #195 ] Merge branch '203-feed_message' into 195-new_design_for_projects
...
Conflicts:
app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
edc8774387
[issue #203 ] Some layout changes & presenters.
...
* Fixed bugs in layout
* Fixed typos
* Fixed bugs in JS
* Added universal partial _feed_message.html.haml
* Added presenters
* Added CommitAsMessage presenter, that prepares Grit::Commit
to be shown as message.
2012-02-19 02:47:57 +04:00
Alexander Machehin
Vokhmin Alexey V
Pavel Chipiga
George Vinogradov
konstantin.grabar