Alexander Machehin
5aa06da501
[ #369 ] fix rendering spec files
2015-02-28 11:39:22 +05:00
Vokhmin Alexey V
13cd263855
#456 : add integration with Group#default_branch, specs
2015-02-20 01:03:04 +03:00
Vokhmin Alexey V
0b7e4a41ec
#369 : updated autocompletes
2014-11-11 22:43:01 +03:00
Alexander Machehin
27f3d371a6
[ #369 ] blob; hightlight a line;
2014-11-10 23:46:44 +05:00
Alexander Machehin
2b9434f346
Merge branch 'master' into 369-bootstrap
...
Conflicts:
Gemfile
Gemfile.lock
app/assets/javascripts/angular-new/models/build_list.js.erb
app/assets/javascripts/extra/build_list.js
app/controllers/projects/build_lists_controller.rb
app/controllers/projects/projects_controller.rb
app/models/platform.rb
app/views/projects/base/_layout.html.haml
app/views/projects/build_lists/_new_form.html.haml
app/views/projects/build_lists/show.html.haml
app/views/projects/git/base/_fork.html.haml
app/views/projects/git/commits/_commits.html.haml
config/locales/en.yml
config/locales/ru.yml
2014-10-16 16:41:29 +06:00
Alexander Machehin
7a151b4fc8
remove wrong line
2014-10-09 20:43:11 +06:00
Alexander Machehin
4872e60c56
add additional check for the undefined method 'html_safe' for nil:NilClass
2014-10-09 14:24:43 +06:00
Alexander Machehin
fad1708318
add rescue from Yajl::ParseError
2014-10-09 13:26:54 +06:00
Alexander Machehin
cb4f9aeb44
fix undefined method 'html_safe' for nil:NilClass
2014-10-09 13:22:37 +06:00
Alexander Machehin
dbb1d19ac0
try to catch a MentosError error
2014-10-07 22:38:52 +06:00
Alexander Machehin
66e21de2b7
[ #369 ] add tree content pagination
2014-07-09 15:38:36 +06:00
Alexander Machehin
388617c248
[ #369 ] git tree page
2014-07-08 20:52:10 +06:00
Vokhmin Alexey V
113a91501f
Fixed: wrong commit committed_date.
2014-07-01 00:21:35 +04:00
Alexander Machehin
737d8c99f3
[ #369 ] new build list page without js & last builds table
2014-06-06 14:01:13 +06:00
Alexander Machehin
f23259775e
[ #369 ] remove codemirror; use pygments
2014-04-15 15:11:14 +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
Vokhmin Alexey V
d04f276f1d
updated concatenation operation
2013-12-30 20:08:42 +04:00
Vokhmin Alexey V
52621ad5dc
#184 : small refactoring according to Alexander's comment, added comments
2013-06-14 14:17:30 +04:00
Vokhmin Alexey V
e36a0386a2
#184 : not show link when submodule does not exist
2013-06-14 13:54:08 +04:00
Alexander Machehin
235e6c8ba8
[ #109 ] fix error with undefined method `name` for String
2013-04-22 23:38:50 +06:00
Alexander Machehin
dccdc74dd9
[ #109 ] sorting branches/tags list
2013-04-22 23:29:02 +06:00
Vokhmin Alexey V
cb00f301ba
#96 : hotfix
2013-04-11 16:07:29 +04:00
Vokhmin Alexey V
165532414d
#93 : update URL to submodule
2013-04-11 15:19:24 +04:00
Vokhmin Alexey V
9e7eb7af94
#29 : merge master into branch
2013-04-03 16:10:22 +04:00
Vokhmin Alexey V
a171be9f53
#31 : add project_version into product
2013-03-27 16:18:24 +04:00
Vokhmin Alexey V
e055d0080b
#29 : removed hack for encoding
2013-03-18 15:36:16 +04:00
Alexander Machehin
5f97791dc2
#944 small refactoring
2013-02-22 16:26:06 +06:00
Alexander Machehin
00639963cb
#944 disable tags at branches
2013-02-22 15:34:12 +06:00
Alexander Machehin
d159948830
[refs #901 ] add anchor to lines
2013-02-08 16:25:05 +06:00
Vokhmin Alexey V
d2a876c9cb
#843 : remove 'latest_' prefix
2013-01-21 21:08:19 +04:00
Alexander Machehin
b299a51610
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-08-01 13:06:41 +06:00
Pavel Chipiga
01a3572de0
Minor update. Fix helper bug. Minor refactor. Refs #263
2012-07-31 17:35:18 +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
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
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
df610931d7
[refs #90 ] commits tab
2012-05-25 16:48:44 +06: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
George Vinogradov
d6d8410b0f
[issue #274 ] Fixed file detection.
...
TODO.
1. Change MIME in editor
2. Change MIME sorting
2012-03-07 05:20:35 +04:00
George Vinogradov
b3750f8644
[issue #195 ] Fixed branch selector.
2012-03-02 20:48:19 +04:00
George Vinogradov
4b024d1728
[issue #195 ] Fixes.
...
* Fixed translations
* Fixed blob display
* Fixed routes
2012-03-01 21:37:24 +04:00
George Vinogradov
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
George Vinogradov
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
George Vinogradov
74d401d087
[issue #133 ] Writed draft of web editing.
2012-02-08 21:51:30 +04:00
Alexander Machehin
70346f0015
[refs #151 ] refactoring
2012-02-06 20:12:33 +06:00
George Vinogradov
f2bfcf8699
[issue #151 ] Probably fixed.
2012-02-05 00:12:37 +04:00
Pavel Chipiga
13780a1b53
Add magic encodings. Refs #95
2012-01-30 22:39:34 +02:00
konstantin.grabar
f46b179486
[refs #113 ] Add json to mime types list
2012-01-20 22:40:00 +04:00
konstantin.grabar
23ace52d90
[refs #113 ] Images render and download href for binary data into blobs
2012-01-20 22:31:01 +04:00
konstantin.grabar
d04de6e2fc
[refs #1832 ] Fixed git repos web interface routes
2011-10-24 14:19:04 +04:00