Alexander Machehin
|
692ffa9dc4
|
Merge branch 'master' into 369-bootstrap
Conflicts:
app/controllers/application_controller.rb
|
2015-02-02 23:38:48 +05:00 |
Alexander Machehin
|
c583e6bcef
|
[abf/abf-ideas#155] remove redirect when rendering error pages
|
2015-02-02 23:37:55 +05:00 |
Alexander Machehin
|
56fb9016ab
|
remove redirect when render error page
|
2015-02-02 23:23:47 +05:00 |
Alexander Machehin
|
fb438e3c75
|
remove redirect when render error page
|
2015-02-02 23:20:45 +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 |
Vokhmin Alexey V
|
5649e2e873
|
#435: added Statistic model
|
2014-10-06 23:16:12 +04:00 |
Alexander Machehin
|
9a90283fcf
|
add resque from ActionController::UnknownFormat exception
|
2014-08-28 20:15:18 +06:00 |
Alexander Machehin
|
2ef938a389
|
[#369] refactoring; add pagination
|
2014-05-06 15:51:04 +06:00 |
Alexander Machehin
|
2aec96d989
|
Revert "fix authenticate_user method"
This reverts commit 0000487cf8 .
|
2014-04-09 14:52:42 +06:00 |
Alexander Machehin
|
0000487cf8
|
fix authenticate_user method
|
2014-04-09 14:41:56 +06:00 |
Vokhmin Alexey V
|
7842f72eb3
|
Fixed: Access violation to this page
|
2014-04-08 17:00:39 +04:00 |
Alexander Machehin
|
7f39986b99
|
[#345] fix error with ActionController::UnknownFormat for .patch and .diff
|
2014-03-26 14:55:29 +06:00 |
Alexander Machehin
|
2ee3ea93bd
|
[#345] remove deprecated dynamic finder methods
|
2014-03-18 19:58:51 +06:00 |
Vokhmin Alexey V
|
c06245aa9f
|
#345: fixed some specs, build_list_observer
|
2014-03-15 02:54:04 +04:00 |
Alexander Machehin
|
a5f56bb835
|
[#345] remove observers; use new labmda syntax
|
2014-03-11 14:28:17 +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 |
Alexander Machehin
|
5c6220a46d
|
try to stop bots (part2)
|
2013-08-28 21:15:28 +06:00 |
Alexander Machehin
|
01380be9a7
|
Revert "try stop bots"
This reverts commit e6238a7621 .
Conflicts:
app/assets/stylesheets/devise/registration.scss
|
2013-08-28 19:35:16 +06:00 |
Alexander Machehin
|
e6238a7621
|
try stop bots
|
2013-08-26 23:53:03 +06:00 |
Vokhmin Alexey V
|
fd66f243e1
|
#192: added Token model, migration, controller
|
2013-06-25 11:00:20 +04:00 |
Vokhmin Alexey V
|
9e7eb7af94
|
#29: merge master into branch
|
2013-04-03 16:10:22 +04:00 |
Vokhmin Alexey V
|
e055d0080b
|
#29: removed hack for encoding
|
2013-03-18 15:36:16 +04:00 |
Vokhmin Alexey V
|
f15be4b92a
|
#23: return json response at RoutingError
|
2013-03-15 17:35:32 +04:00 |
Alexander Machehin
|
ba74024b29
|
fixed order of the handle exceptions
|
2012-10-25 15:42:47 +06:00 |
Vokhmin Alexey V
|
25620af00c
|
hot fix for specs
|
2012-10-19 19:35:19 +04:00 |
Vokhmin Alexey V
|
d563c9a9f9
|
#702: added handling errors
|
2012-10-19 15:47:49 +04:00 |
Vladimir Sharshov
|
a20e1552cc
|
[refs #374] Fix test, small refactoring.
|
2012-09-27 16:13:59 +04:00 |
Vladimir Sharshov
|
0dd103b7f4
|
[refs #374] Fix build list tests, remove unused code.
|
2012-09-27 03:54:56 +04:00 |
Vladimir Sharshov
|
77b57cce11
|
[refs #374] Fix support http basic auth, fix tests, fix abilities.
|
2012-09-26 21:15:11 +04:00 |
konstantin.grabar
|
7812adfdbc
|
[refs #374] Add custom http basic auth for api
|
2012-09-21 23:15:56 +04:00 |
konstantin.grabar
|
b9a622acec
|
[refs #374] Add unixtime search and output. Fix rate limit configuration and 404 status
|
2012-09-05 17:47:25 +04:00 |
konstantin.grabar
|
554950a14c
|
[refs #374] Fix some tests. Comment 500 error cautch
|
2012-08-15 19:58:22 +04:00 |
konstantin.grabar
|
7fba004858
|
[refs #374] Api tests refactor
|
2012-08-13 13:58:26 +04:00 |
konstantin.grabar
|
134b386631
|
[refs #374] Fix api and build_lists tests
|
2012-08-09 18:38:41 +04:00 |
konstantin.grabar
|
7f475948f6
|
[refs #374] Uncomment 404/500/503 rescues
|
2012-08-08 18:08:56 +04:00 |
konstantin.grabar
|
f3db00832a
|
[refs #374] Api v1 base functional and specs
|
2012-08-03 14:05:05 +04:00 |
konstantin.grabar
|
f674735c8c
|
[refs #374] Merge master into 374-rest_api_for_builds
|
2012-07-30 13:31:28 +04:00 |
konstantin.grabar
|
48f8c3ad08
|
[refs #374] Add json responses for build lists api
|
2012-07-26 13:22:51 +04: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
|
59acdf4f44
|
[refs #443] fixed setting language
|
2012-05-17 16:28:58 +06:00 |
Alexander Machehin
|
8facb45bb7
|
[refs #443] fixed error whis empty accept languages
|
2012-05-16 23:20:42 +06:00 |
Alexander Machehin
|
4f7ccbb4a9
|
[refs #443] fixed preferred language
|
2012-05-16 15:48:42 +06:00 |
konstantin.grabar
|
cd153375dd
|
[refs #396] Devise token auth update for atom feed. Some atom feed fixes.
|
2012-04-18 19:15:04 +04:00 |
Pavel Chipiga
|
d6e6959f46
|
Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349, #263
|
2012-03-31 02:37:54 +03:00 |
Vladimir Sharshov
|
5db485a4c0
|
[Refs #263] Remove Aut BuildList. Part 2
|
2012-03-29 22:43:46 +04:00 |
Alexander Machehin
|
fcc1fad0d1
|
[refs #270] fixed translations
|
2012-03-22 18:00:34 +06:00 |
Alexander Machehin
|
a6a5b722d2
|
[refs #270] use devise lockable to ban
|
2012-03-21 23:45:51 +06:00 |
Alexander Machehin
|
5c408540ff
|
[refs #270] can ban user
|
2012-03-21 02:06:51 +06:00 |
Alexander Machehin
|
de62aaad53
|
[refs #257] fix user update registration page
|
2012-03-08 00:47:19 +06:00 |