Vokhmin Alexey V
|
07b27b934f
|
#90: updated #index page for pull-requests
|
2012-09-26 15:46:23 +04:00 |
Alexander Machehin
|
dfbf8a8d58
|
Merge branch 'master' into 90-pull
Fucking conflicts:
app/controllers/projects/issues_controller.rb
app/models/ability.rb
app/views/projects/issues/show.html.haml
config/routes.rb
db/schema.rb
lib/tasks/import.rake
spec/models/comment_for_commit_spec.rb
vendor/assets/javascripts/bootstrap-tab.js
vendor/assets/stylesheets/bootstrap.css
|
2012-09-25 17:55:30 +06:00 |
|
Alexander Machehin
|
2c6d4bae9e
|
[refs #616] add error messages to ajax
|
2012-09-24 23:34:14 +06:00 |
|
Alexander Machehin
|
a492367a17
|
[refs #616] some fixes and refactoring
|
2012-09-18 16:00:21 +06:00 |
|
Alexander Machehin
|
1c3ca85f03
|
[refs #616] add comment for clarity
|
2012-08-27 15:43:44 +06:00 |
|
Alexander Machehin
|
2c0826a77d
|
[refs #616] fixed showing body after update
|
2012-08-25 23:40:51 +06:00 |
|
Alexander Machehin
|
4b4007651d
|
[refs #616] small refactoring issues controller
|
2012-08-25 23:38:11 +06:00 |
|
Alexander Machehin
|
e8d80b849a
|
[refs #616] fixed removing labels from issue
|
2012-08-25 21:26:24 +06:00 |
|
Alexander Machehin
|
1142f9ee8c
|
[refs #616] fixed searching collaboratots to assignment
|
2012-08-20 23:37:22 +06: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 |
|
Alexander Machehin
|
91bf65d65d
|
[refs #90] comments for pull requests (slow version)
|
2012-06-05 18:08:52 +06:00 |
|
Alexander Machehin
|
4b8def5bd0
|
[refs #90] add pulls to tracker
|
2012-06-04 23:00:19 +06:00 |
|
Alexander Machehin
|
5c9f914e4a
|
[refs #511] add issue index authorization
|
2012-05-30 22:03:07 +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 |
|
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
|
2539ef4795
|
Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263
|
2012-05-02 12:18:07 +03:00 |