konstantin.grabar
|
33e6cdc285
|
[refs #570] Remove mass build counters logs and transactions
|
2012-07-27 19:17:07 +04:00 |
Vladimir Sharshov
|
255bd3a73a
|
Merge pull request #589 from warpc/551-old_bugs_with_by_object
[refs #551] by_object changed to by_actor.
|
2012-07-27 06:45:34 -07:00 |
George Vinogradov
|
2efb103084
|
[issue #551] Changed get to delete in spec.
|
2012-07-27 17:27:24 +04:00 |
George Vinogradov
|
d5b0c96d1e
|
[issue #551] Added spec.
|
2012-07-27 17:17:37 +04:00 |
Alexander Machehin
|
25bdbb01d6
|
[refs #90] project fullname
|
2012-07-27 18:52:31 +06:00 |
Vladimir Sharshov
|
2105457d62
|
Merge pull request #587 from warpc/586-datatables_json_fixes
[refs #586] Custom JSON generators changed to JBuilder
|
2012-07-27 05:45:23 -07:00 |
George Vinogradov
|
bbb03d3243
|
[issue #586] Removed @total_project & @total_user.
|
2012-07-27 16:40:13 +04: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 |
konstantin.grabar
|
548fb99ebe
|
[refs #570] Try to do counters change into transaction with locking
|
2012-07-27 16:28:08 +04:00 |
Vladimir Sharshov
|
5aecdc203b
|
Merge pull request #571 from warpc/263-refactoring
[refs #263] Big git refactoring
|
2012-07-27 04:51:34 -07:00 |
Pavel Chipiga
|
b476f7248c
|
Minor refactor. Refs #263
|
2012-07-27 13:47:23 +03:00 |
George Vinogradov
|
40b0bb4b58
|
[issue #551] by_object changed to by_actor.
|
2012-07-27 08:12:09 +04:00 |
Vladimir Sharshov
|
95f1e13b96
|
Merge pull request #588 from warpc/583-build_list_page_fix
[refs #583] Remove control publication block from public vision
|
2012-07-26 16:26:48 -07:00 |
Vladimir Sharshov
|
bc2eb541f3
|
[refs #583] Change and to &&
|
2012-07-27 03:17:37 +04:00 |
Vladimir Sharshov
|
68b36c8ca9
|
Merge pull request #584 from warpc/578-user_creation_fix
[issue #578] Fixed error handling in PresonalRepository.
|
2012-07-26 14:44:23 -07:00 |
George Vinogradov
|
3e4c03dd6a
|
[issue #583] Added missing check to BuildList page
|
2012-07-27 01:44:15 +04:00 |
Pavel Chipiga
|
566cd8209b
|
Take back branches_and_repos method. Refs #263
|
2012-07-27 00:24:14 +03:00 |
Pavel Chipiga
|
fb60dac748
|
Merge branch 'master' into 263-refactoring
Conflicts:
db/schema.rb
|
2012-07-27 00:19:36 +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 |
George Vinogradov
|
03cc4668dc
|
[issue #586] Custom JSON generators changed to JBuilder
|
2012-07-27 00:25:44 +04:00 |
konstantin.grabar
|
354752f6cb
|
Merge remote-tracking branch 'origin/570-mass_builds_status_counters_bug' into 570-mass_builds_status_counters_bug
|
2012-07-26 15:47:33 +04:00 |
konstantin.grabar
|
f9b217379d
|
[refs #570] Add mass build counters logs
|
2012-07-26 15:45:23 +04:00 |
konstantin.grabar
|
91dddd5dac
|
Merge branch 'master' into 570-mass_builds_status_counters_bug
|
2012-07-26 15:06:09 +04:00 |
George Vinogradov
|
f1839f0ad0
|
[issue #578] Added submit blocking to user creation
|
2012-07-26 02:12:06 +04:00 |
George Vinogradov
|
6f4f48cbce
|
[issue #578] Fixed error handling in PresonalRepository.
|
2012-07-26 01:49:55 +04:00 |
Vladimir Sharshov
|
606609dea6
|
Merge pull request #580 from warpc/576-flash_notifies
[refs #576] Add flash notifies
|
2012-07-25 12:18:44 -07:00 |
Pavel Chipiga
|
03509e714c
|
Merge branch 'master' into 263-refactoring
|
2012-07-25 21:42:48 +03:00 |
Pavel Chipiga
|
e3ee41294d
|
Use current locale for message body display. Refs #576
|
2012-07-25 21:21:52 +03:00 |
Pavel Chipiga
|
1362ee87c5
|
Add submenu for notifies section. Refs #576
|
2012-07-25 21:14:22 +03:00 |
Pavel Chipiga
|
e09a9467e2
|
Fix flash notifies display bug. Add admin section link. Move controller to admin namspace. Refactor and fix notifies controller. Refs #576
|
2012-07-25 21:05:25 +03:00 |
konstantin.grabar
|
c0036a1bb5
|
[refs #576] Fix should_show? method and template offsets
|
2012-07-25 16:41:12 +04:00 |
Vladimir Sharshov
|
925ce3a55e
|
Merge pull request #582 from warpc/581-root_destroy
[refs #581] Disable automatic delete child fork project when delete parent
|
2012-07-24 12:19:56 -07:00 |
Alexander Machehin
|
a0a4c8b100
|
[refs #581] dont destroy child projects
|
2012-07-24 22:02:02 +06:00 |
konstantin.grabar
|
931e7a22b4
|
[refs #576] Merge master into 576-flash_notifies
|
2012-07-24 14:08:34 +04:00 |
konstantin.grabar
|
3d19a4f23e
|
[refs #576] Optimize tests, views and model
|
2012-07-24 13:19:22 +04:00 |
konstantin.grabar
|
15a86c2ecd
|
[refs #576] Add flash notifies
|
2012-07-23 18:25:37 +04:00 |
George Vinogradov
|
ee15ca26ca
|
[issue #565] Refactoring. Fixed html mail template.
|
2012-07-20 23:59:32 +04:00 |
George Vinogradov
|
a69ad0f88a
|
[issue #565] Changed translation.
|
2012-07-20 20:58:23 +04:00 |
George Vinogradov
|
8758fa87af
|
[issue #565] Added support link to static pages
|
2012-07-20 20:57:04 +04:00 |
George Vinogradov
|
0d9a32a1c0
|
[issue #565] Fixed bug in mailer.
|
2012-07-20 20:56:47 +04:00 |
George Vinogradov
|
c37866d5e6
|
[issue #565] Added page title.
|
2012-07-20 20:36:09 +04:00 |
George Vinogradov
|
f61e9db5c6
|
[issue #565] Added Support link to bottom menu
|
2012-07-20 20:23:51 +04:00 |
George Vinogradov
|
6d046764ef
|
[issue #565] Merge branch 'master' into 565-feedback_form
Conflicts:
app/assets/stylesheets/design/custom.scss
|
2012-07-20 20:15:55 +04:00 |
George Vinogradov
|
d6c65a1626
|
[issue #565] Added feedback form.
* Added web pages to send request
* Added mailer to send feedback message.
|
2012-07-20 20:06:31 +04:00 |
Alexander Machehin
|
d130409640
|
Merge branch 'master' into 90-pull
Conflicts:
app/assets/stylesheets/design/custom.scss
|
2012-07-20 15:33:11 +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
|
2cc3798cdc
|
Merge branch 'master' into 263-refactoring
|
2012-07-19 18:58:47 +03:00 |
Vladimir Sharshov
|
1f0887ac97
|
[refs #570] Change localization for fields(part 2)
|
2012-07-18 23:26:13 +04:00 |
Vladimir Sharshov
|
c5686c76d3
|
Merge branch '570-mass_builds_status_counters_bug' of github.com:warpc/rosa-build into 570-mass_builds_status_counters_bug
|
2012-07-18 23:08:57 +04:00 |