Alexander Machehin
07e02d9a17
[refs #90 ] modified Update commits button
2012-07-10 00:41:39 +06:00
George Vinogradov
3c8b77027e
[issue #428 ] Allowed any update_types when build for released platform.
2012-07-06 03:05:47 +04:00
George Vinogradov
e00e88340b
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
db/schema.rb
2012-07-04 03:31:51 +04:00
George Vinogradov
094f25c049
[issue #428 ] Changed attaching advisory to BuildList.
...
Removed Chosen. Added text field with incremental search.
2012-07-04 02:52:13 +04:00
Alexander Machehin
89abd20c95
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-07-03 21:22:10 +06:00
konstantin.grabar
10aed58bdd
[refs #442 ] Small refactor. Remove bootstrap collapse
2012-06-28 15:31:25 +04:00
konstantin.grabar
b6d769ad66
[refs #442 ] Change mass builds table
2012-06-27 18:07:05 +04:00
Alexander Machehin
1ffb1b3940
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/models/project.rb
db/schema.rb
2012-06-27 16:20:38 +06:00
konstantin.grabar
bdb97b8891
[refs #442 ] Add statistics data to mass builds. Small refactor for report
2012-06-25 19:20:35 +04:00
konstantin.grabar
baec8a1016
[refs #525 ] Fix clear action rights
2012-06-25 18:26:01 +04:00
George Vinogradov
e4f62ea592
[issue #428 ] Added filter by advisory_id to Advisories
2012-06-20 21:51:08 +04:00
konstantin.grabar
904cfca5c9
[refs #529 ] Fix branch set for repository with dot in name
2012-06-19 18:52:29 +04:00
George Vinogradov
ecd4498484
[issue #428 ] Changes in advisories.
...
* Added Many2Many relation between advisories and projects.
* Added autocompletion to build list's advisory
* Bootstrap's JS moved to vendor/
2012-06-19 02:49:17 +04:00
Alexander Machehin
89bc8954e2
[refs #90 ] smaller font for diff
2012-06-08 14:31:33 +06:00
George Vinogradov
e7c0eab736
[issue #428 ] Merge branch 'master' into 428-advisory
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-06-04 23:59:00 +04:00
George Vinogradov
abe2b8a30d
[issue #428 ] Work with existing advisories.
...
* Added advisories page to platform
* Added attacing of existing advisories to BuildList.
2012-06-04 23:49:20 +04:00
Alexander Machehin
60aba754ae
[refs #90 ] pull title/body update
2012-05-31 22:57:52 +06:00
Alexander Machehin
11c67fb07d
Revert "[refs #90 ] issue status -> state" & changed state -> status
...
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.
Conflicts:
app/controllers/projects/issues_controller.rb
db/migrate/20120412173938_create_pull_requests.rb
db/schema.rb
2012-05-29 16:50:25 +06:00
Vladimir Sharshov
c119ae0d20
Merge pull request #504 from warpc/442-mass_build
...
[refs #442 ] Add sidebar for mass rebuild page in platform
2012-05-28 05:45:48 -07:00
konstantin.grabar
82b5999e32
[refs #442 ] Add sidebar
2012-05-28 14:28:19 +04:00
Vladimir Sharshov
3ed195bb86
Merge pull request #502 from warpc/442-mass_build
...
[refs #442 ] Mass build refactor and fixes
2012-05-28 02:00:30 -07:00
konstantin.grabar
a79d946b6b
[refs #442 ] Mass build refactor and fixes
2012-05-25 19:56:26 +04:00
konstantin.grabar
2d1001f1c1
[refs #478 ] Fix js handler
2012-05-25 14:49:37 +04:00
konstantin.grabar
e38bf98d54
[refs #478 ] Move js logic to another handler
2012-05-25 11:26:42 +04:00
Alexander Machehin
4f1d23a2a4
[refs #90 ] branch, merge validation
2012-05-24 23:10:49 +06:00
konstantin.grabar
0958299f51
[refs #478 ] Change js handler logic
2012-05-24 16:51:39 +04:00
konstantin.grabar
3d2bcdd019
[refs #478 ] Add js handler to disable frozen platforms and their reps
2012-05-24 14:21:57 +04:00
konstantin.grabar
9aefce6b68
[refs #442 ] Merge master into 442-mass_build
2012-05-21 18:33:12 +04:00
Alexander Machehin
6b6887250b
Merge branch 'master' into 90-pull
...
Conflicts:
db/schema.rb
2012-05-21 17:31:49 +06:00
konstantin.grabar
be2ab9154c
[refs #442 ] Fix checkboxes styles. Return delay for build all. Add mass build select and more fixes
2012-05-21 14:18:29 +04:00
Vladimir Sharshov
241efb95b1
Merge pull request #486 from warpc/443-tour
...
[refs #443 ] fix dropmenu in tours pages for registered users
2012-05-18 03:17:01 -07:00
Alexander Machehin
3a2dc965c9
[refs #443 ] fixed dropmenu
2012-05-18 15:51:26 +06:00
Pavel Chipiga
bea7ed26d6
Fix advisory template. Fix rosa tour. Refs #428 , #482
2012-05-18 01:38:43 +03:00
Alexander Machehin
fcffff4178
Merge branch 'master' into 90-pull
...
Conflicts:
app/assets/stylesheets/design/custom.scss
config/locales/title.en.yml
config/locales/title.ru.yml
config/routes.rb
db/schema.rb
2012-05-17 22:58:29 +06:00
Vladimir Sharshov
2892689807
Merge pull request #469 from warpc/443-tour
...
[refs #466 ] Add localization for system tour. Fix for auto detecting users language.
2012-05-16 05:19:59 -07:00
Alexander Machehin
2651f0dc52
[refs #443 ] localize top image
2012-05-16 17:10:22 +06:00
Alexander Machehin
05746ea449
[refs #466 ] add i18n
2012-05-15 21:35:48 +06:00
Vladimir Sharshov
64d5600e6f
Merge pull request #447 from warpc/443-tour
...
[refs #443 ] Tour about the system
2012-05-12 10:11:16 -07:00
Alexander Machehin
7a011606a5
[refs #443 ] add pirobox popup
2012-05-12 19:17:07 +06:00
Alexander Machehin
0e5b2ba25d
[refs #443 ] compact styles
2012-05-12 15:54:24 +06:00
George Vinogradov
cada9f6e51
[issue #443 ] Changed tour routes. Fixed submenu position.
2012-05-12 01:05:48 +04:00
George Vinogradov
218904675d
[issue #443 ] Fixed styles. Removed whitespace between content and
...
footer.
2012-05-12 00:24:40 +04:00
Alexander Machehin
5f5eb00c4f
[refs #443 ] abf tour
2012-05-12 00:15:20 +06:00
konstantin.grabar
60fdf9e998
[refs #396 ] Add atom feed icon
2012-05-11 19:44:19 +04:00
Pavel Chipiga
52f5e01575
Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428
2012-05-06 00:43:04 +03:00
George Vinogradov
05ef799fa4
[issue #428 ] Added advisories list. Added translations.
2012-05-05 21:18:29 +04:00
Alexander Machehin
36b4ce2d99
Merge branch 'master' into 90-pull
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/projects/issues_controller.rb
app/models/project.rb
config/locales/menu.en.yml
config/routes.rb
db/schema.rb
2012-05-03 23:19:43 +06:00
Pavel Chipiga
72e3eaf1a1
Minor design fix. Refs #263
2012-05-03 18:56:33 +03:00
Pavel Chipiga
abb60a503a
Minor design fix. Refactor register requests. Refactor case insensitive search. Other minor fixes and code cleanup. Refacor and improve owner constraint. Refs #263
2012-05-03 17:08:02 +03:00
Alexander Machehin
9e5db741d3
Merge branch 'master' into 90-pull
...
Conflicts:
app/models/project.rb
db/schema.rb
2012-05-02 23:08:24 +06:00
Pasha
0c8f8e14a6
Merge pull request #419 from warpc/347-javascript_refactoring
...
[issue #347 ] Fixed artefacts in Add Collaborators form.
2012-04-23 12:21:00 -07:00
Alexander Machehin
a8ccf454ee
[refs #90 ] first steps of pull rendering
2012-04-23 23:34:11 +06:00
Alexander Machehin
628fed40ea
[refs #90 ] issue status -> state
2012-04-23 23:34:11 +06:00
konstantin.grabar
89bfa8d0a9
[refs #415 ] Fix radio button click handler
2012-04-23 13:50:42 +04:00
George Vinogradov
af18f4404f
[issue #347 ] Fixed artefacts in Add Collaborators form.
2012-04-22 13:17:33 +04:00
George Vinogradov
678f7cc0ed
[issue #347 ] Changed search field.
2012-04-20 00:35:31 +04:00
George Vinogradov
510b0c0c50
[issue #347 ] Merge branch 'master' into 347-javascript_refactoring
...
Conflicts:
app/assets/stylesheets/design/custom.scss
app/models/group.rb
app/models/user.rb
2012-04-19 19:32:11 +04:00
George Vinogradov
f9d2baef5a
[issue #347 ] Added filter.
2012-04-19 19:27:16 +04:00
George Vinogradov
618d1ecb49
[issue #408 ] Fixed bug with selectbox
2012-04-18 21:31:11 +04:00
George Vinogradov
9566855110
[issue #347 ] Added missed lib
2012-04-18 16:17:11 +04:00
George Vinogradov
9d96b2b565
[issue #408 ] Removed comment.
2012-04-18 14:46:34 +04:00
George Vinogradov
6c64125787
[issue #408 ] Changed behavior of build list for released platform
2012-04-17 22:18:39 +04:00
George Vinogradov
8204196275
[issue #347 ] Removed comments. Added filter field to collaborators
...
table.
2012-04-17 17:39:14 +04:00
Alexander Machehin
f31b243ae9
[refs #385 ] zip image
2012-04-17 18:06:04 +06:00
George Vinogradov
871c8ed1f4
[issue #347 ] Fixed bugs. Some changes.
2012-04-16 23:22:08 +04:00
Vladimir Sharshov
c339f2aee0
Merge pull request #403 from warpc/223-change_build_lists_new_js_handlers
...
[refs #223 ] Add platform branch auto select if this branch exist
2012-04-16 10:00:53 -07:00
konstantin.grabar
d24422f757
[refs #223 ] Add branch auto select
2012-04-16 20:06:34 +04:00
Alexander Machehin
2dedbd92d0
[refs #194 ] assignee & user
2012-04-14 01:44:04 +06:00
Alexander Machehin
5cfadcd723
[refs #385 ] add dropdown menu to choose archive format
2012-04-13 17:24:24 +06:00
George Vinogradov
a68d4a2926
[issue #347 ] Many changes.
...
Changes includes:
* Changed Collaborator model;
* Autocomplete now works through backbone;
* Changed autocomplete styles;
* Groups have their own avatar;
* Changed previous backbone scripts;
2012-04-13 02:01:24 +04:00
Alexander Machehin
770030e180
[refs #385 ] zip archive
2012-04-12 00:29:08 +06:00
konstantin.grabar
18bda07369
Merge master into 223-change_build_lists_new_js_handlers
2012-04-10 18:00:48 +04:00
konstantin.grabar
f7e09c993d
[refs #223 ] Optimise code by jQuery chains
2012-04-10 17:15:48 +04:00
konstantin.grabar
d6dc51ba93
[refs #223 ] Choosen rep auto set
2012-04-10 13:05:42 +04:00
Vladimir Sharshov
6d4f94e2c4
Merge pull request #389 from warpc/353-fork
...
[Refs #353 ] can fork project to group
2012-04-09 12:46:15 -07:00
Alexander Machehin
e349a69883
[refs #353 ] can fork project to group
2012-04-09 23:56:03 +06:00
George Vinogradov
71c8efabf9
[issue #347 ] Added backbone. Changed collaborators page.
2012-04-09 21:11:39 +04:00
konstantin.grabar
6ccf7e8456
[refs #223 ] Change js handlers and some inputs logics
2012-04-09 18:33:51 +04:00
Alexander Machehin
96b3c831b7
[refs #358 ] br -> p
2012-04-06 02:21:19 +06:00
konstantin.grabar
39dd53ff9b
[refs #358 ] Add git clone repo help hint
2012-04-05 11:26:03 +04:00
George Vinogradov
1e8021fe35
[issue #369 ] Added TOS page.
2012-03-31 17:18:22 +04:00
Pavel Chipiga
36b2eaa784
Fix root page search field design. Allow aninymous search only projects. Fix activity_feeds routes. Show anonymous project build lists. Remove unused specs. Refs #349
2012-03-31 03:43:55 +03: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
George Vinogradov
78943fdc04
[issue #195 ] Added legend for projects table. Added titles.
2012-03-30 18:51:57 +04:00
George Vinogradov
c03ae5015e
[issue #195 ] Fixed leave button. Added participant icons.
2012-03-29 20:27:33 +04:00
George Vinogradov
baf35da99c
[issue #195 ] Merge branch 'master' into 195-new_design_for_projects
...
Conflicts:
app/controllers/projects_controller.rb
2012-03-27 21:23:09 +04:00
George Vinogradov
9bb1d80172
[issue #195 ] Added AJAX to /projects list.
2012-03-27 19:50:00 +04:00
George Vinogradov
a3aaf4f7ce
[issue #195 ] Fixed bug with line numbers in blob show.
2012-03-27 14:12:26 +04:00
George Vinogradov
dd8e3b0497
[issue #195 ] Added JQuery datatables to /projects
2012-03-25 01:36:56 +04:00
Vladimir Sharshov
f085367659
Merge pull request #337 from warpc/193-wiki
...
[Refs #193 ] Restyle wiki
2012-03-23 08:59:17 -07:00
Alexander Machehin
86bd036418
[refs #193 ] changes in wiki
2012-03-23 21:36:47 +06:00
Alexander Machehin
eb0545221c
[refs #194 ] change styles at issues list
2012-03-23 19:31:51 +06:00
Vladimir Sharshov
75ae7f2189
[Refs #263 ] Update css for new version
2012-03-22 20:33:43 +04:00
Alexander Machehin
071c391a6e
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-22 21:15:10 +06:00
Vladimir Sharshov
a85ce1d1f7
Merge pull request #332 from warpc/195-new_design_for_projects
...
[Refs #195 ] new design for projects (support group as collaborators)
2012-03-22 08:08:26 -07:00
George Vinogradov
524fa2302f
[issue #279 ] Changed buttons alignment.
2012-03-22 17:53:35 +04:00
konstantin.grabar
c6eb68e903
[refs #325 ] Fixes descripton styles for project page into main css
2012-03-22 16:31:39 +04:00
konstantin.grabar
21c33b384b
[refs #325 ] Add new design to error pages
2012-03-22 11:16:56 +04:00
George Vinogradov
9e31ae75b1
[issue #195 ] Added groups support to project.
2012-03-22 04:44:05 +04:00
Vladimir Sharshov
ee867aa8d4
Merge pull request #324 from warpc/200-new_build_repos_rules
...
[refs #200 ] Fix chbx behaviour for repos and their platforms
2012-03-21 08:06:54 -07:00
konstantin.grabar
5abf64e353
[refs #200 ] Fix chbx behaviour for repos and their platforms
2012-03-21 19:04:01 +04:00
Alexander Machehin
3c7dec3b97
Merge branch '3.2-master' into 270-user_control
2012-03-21 19:39:55 +06:00
Vladimir Sharshov
81d18b5337
Merge pull request #323 from warpc/200-new_build_repos_rules
...
[Refs #200 ] Move some fields to rights part of the form. Hide empty platform. Fix checkbox checking on build list form.
2012-03-21 05:17:23 -07:00
konstantin.grabar
f9850c6885
[refs #200 ] Fix checkbox checking on build list form
2012-03-21 15:34:11 +04:00
Vladimir Sharshov
375aa7e74e
Merge pull request #322 from warpc/265-activity_feed_messages
...
[refs #265 ] add ajax to older messages
2012-03-21 03:50:25 -07:00
Alexander Machehin
b678320638
[refs #265 ] add ajax to older messages
2012-03-21 16:29:45 +06:00
Alexander Machehin
4a6ce6c8a8
Merge branch '3.2-master' into 270-user_control
...
Conflicts:
app/views/users/index.html.haml
2012-03-21 15:29:44 +06:00
Vladimir Sharshov
d2da4fc0ba
[Refs #263 ] Fix css
2012-03-21 02:53:56 +04:00
Vladimir Sharshov
ba140c67f9
[Refs #263 ] Align the menu, change colors for text and background
2012-03-21 02:47:51 +04:00
Alexander Machehin
20ff998f08
[refs #270 ] user control
2012-03-21 00:12:18 +06:00
Vladimir Sharshov
047425a27f
Merge pull request #318 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms(add control for members, fix bugs)
2012-03-20 09:48:57 -07:00
George Vinogradov
7c0585ee87
[issue #279 ] Added members and other changes.
2012-03-20 20:24:18 +04:00
Vladimir Sharshov
09fcc04489
Merge pull request #315 from warpc/200-new_build_repos_rules
...
[refs #200 ] Change build list repos and platforms interface
2012-03-20 06:02:49 -07:00
konstantin.grabar
31e0c9191c
[refs #200 ] Fix build list form interface and include_repos logic
2012-03-20 14:36:31 +04:00
konstantin.grabar
f0645be9c5
[refs #200 ] Change build list repos and platforms interface
2012-03-19 23:52:46 +04:00
George Vinogradov
ddc95c25fb
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-19 18:56:04 +04:00
George Vinogradov
1cbc3f5b7a
[issue #279 ] Added block of connection data for personal platform.
2012-03-19 18:46:12 +04:00
Alexander Machehin
0c1d57cd8c
[refs #279 ] can resize textarea in product edit page
2012-03-19 18:16:12 +06:00
konstantin.grabar
348fd40daf
[refs #223 ] Fix build status color helpers
2012-03-19 12:39:46 +04:00
konstantin.grabar
b3d7091db0
Merge 3.2-master into 223-monitoring_design
2012-03-19 10:41:30 +04:00
konstantin.grabar
4b26eebeca
[refs #223 ] Add new design to build list task page
2012-03-18 12:20:31 +04:00
Vladimir Sharshov
42eb250942
Merge pull request #302 from warpc/279-new_design_for_platforms
...
[issue #279 ] Fixed some bugs:
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
* RepositoriesController#projects_list by unprivilleged user.
2012-03-15 16:15:58 -07:00
George Vinogradov
cc68163238
[issue #279 ] Fixed some bugs:
...
* Redirect to repositroies page when remove repository.
* Fixed sorting background in Datatables styles.
* Fixed save button translation in platforms form.
* Fixed platform save & create flashes.
* Fixed cancel buttons in platform, product & repository forms.
* Redirect to created product on creation.
* Redirect to platform's products page after product destruction.
* Fixed permissions to Build button on product page.
* Fixed permissions to Add button on repository page.
* Fixed forbidden redirect when trying to acces
RepositoriesController#projects_list by unprivilleged user.
2012-03-16 02:56:12 +04:00
Vladimir Sharshov
e719633862
Merge pull request #300 from warpc/279-new_design_for_platforms
...
[Refs #279 ] new design for platforms (bugfixes, ACL and filters)
2012-03-15 14:50:37 -07:00
Vladimir Sharshov
7bab315b96
[Refs #279 ] Fix url and submit button size
2012-03-15 18:02:10 +04:00
George Vinogradov
3c60347a23
[issue #279 ] Fixes.
...
* Almost finished permissions fixes
* Removed is_template from product
* Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00
George Vinogradov
747edb73a5
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
db/schema.rb
2012-03-14 21:43:08 +04:00
George Vinogradov
5a77b17a43
[issue #279 ] Almost finished design for platforms
...
TODO:
* Add design for crontab generator
* Fix path generation
2012-03-14 21:22:47 +04:00
George Vinogradov
304141b1ba
[issue #279 ] Added views and removed datatables plugin
...
* Datatables plugin moved to lib.
* Added views to platform and repositories.
2012-03-13 19:12:06 +04:00
George Vinogradov
952c9e46ea
[issue #279 ] Added datatables pagination extension
2012-03-13 18:36:42 +04:00
Vladimir Sharshov
b07d81644a
[Refs #223 ] Monitoring colors code in index page
2012-03-13 15:04:29 +04:00
Vladimir Sharshov
19bcdf94d9
[Refs #195 ] More space for project url
2012-03-12 18:31:25 +04:00
George Vinogradov
61bd704cb1
[issue #279 ] Added platform repositories list.
2012-03-12 03:58:25 +04:00
George Vinogradov
535c075d3e
[issue #279 ] Added platform main page, menu & sidebar
2012-03-12 03:08:50 +04:00
George Vinogradov
19a962560a
[issue #279 ] Merge branch '3.2-master' into 279-new_design_for_platforms
...
Conflicts:
app/assets/stylesheets/design/custom.scss
2012-03-12 01:38:20 +04:00
Vladimir Sharshov
11434ff423
[Refs #285 ] Fix css style, rename button
2012-03-11 20:38:28 +04:00
Vladimir Sharshov
e2b3eb7b7f
[Refs #285 ] Fix current_user avatar for all user, replace button Edit
2012-03-11 20:02:07 +04:00
Pavel Chipiga
41cd1ddaf3
Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195
2012-03-07 23:34:49 +02:00
Vladimir Sharshov
e49551756c
Merge pull request #276 from warpc/194-issue_page
...
[Refs #194 ] Fix for manage labels and executor
2012-03-07 11:26:11 -08:00
George Vinogradov
9c78a917a1
[issue #279 ] Added platforms page.
2012-03-07 22:59:37 +04:00
Alexander Machehin
8df4fdfa5c
[refs #194 ] remove labels search from js
2012-03-07 22:26:43 +06:00
Vladimir Sharshov
1cb109119d
Merge pull request #277 from warpc/274-file_detection_fixes
...
[Refs #274 ] file detection fixes
2012-03-07 06:53:16 -08:00
Alexander Machehin
c657efc338
[refs #194 ] show all project labels without searching
2012-03-07 19:36:17 +06:00
Alexander Machehin
9a6beef2da
[refs #194 ] fix issue managing labels
2012-03-07 16:50:45 +06:00
Alexander Machehin
4b173932e5
[refs #194 ] fix managing issue executor
2012-03-07 16:44:42 +06:00
Alexander Machehin
82d26b08b9
[refs #223 ] fix selector
2012-03-07 16:27:29 +06: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
Alexander Machehin
4b9d0616d6
Merge branch '3.2-master' into 194-issue_page
...
Conflicts:
app/views/issues/_create_sidebar.html.haml
2012-03-07 01:19:34 +06: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
Alexander Machehin
8ae7ebee2b
Merge branch '3.2-master' into 194-issue_page
2012-03-06 22:51:13 +06:00