Alexander Machehin
|
fbc537174e
|
[refs #90] search base project by fullname
|
2012-09-28 21:39:45 +06:00 |
Alexander Machehin
|
abafbc6ef5
|
Merge again-and-again branch 'master' into 90-pull
Conflicts:
db/schema.rb
|
2012-09-28 00:09:34 +06:00 |
Alexander Machehin
|
2b4e2f03e5
|
Merge pull request #585 from warpc/374-rest_api_for_builds
[refs #374] Add json responses for build lists api
|
2012-09-27 07:00:19 -07: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 |
Alexander Machehin
|
a994e7dd74
|
Merge remote-tracking branch 'origin/90-pull' into 90-pull
|
2012-09-26 23:10:45 +06:00 |
Alexander Machehin
|
4100b875bd
|
[refs #90] fixed access
|
2012-09-26 23:10:04 +06:00 |
Alexander Machehin
|
cc05fa695a
|
[refs #90] fixed pull abilities part 2
|
2012-09-26 23:09:29 +06:00 |
Vokhmin Alexey V
|
37fbb4632e
|
#90: updated branch
|
2012-09-26 21:04:12 +04:00 |
Vokhmin Alexey V
|
613db04375
|
#90: added limit for commits into the pull request
|
2012-09-26 21:00:58 +04:00 |
Vokhmin Alexey V
|
6f889b15a9
|
#90: added access to show pull requests
|
2012-09-26 19:39:47 +04:00 |
Vokhmin Alexey V
|
37c9a906c4
|
Merge branch '90-pull' into 90-separate-issues-and-pull-requests
|
2012-09-26 18:45:26 +04:00 |
Vokhmin Alexey V
|
6070c276f6
|
Merge branch 'master' into 90-pull
|
2012-09-26 18:33:04 +04:00 |
Vokhmin Alexey V
|
07b27b934f
|
#90: updated #index page for pull-requests
|
2012-09-26 15:46:23 +04:00 |
Alexander Machehin
|
dbf1a5f8ca
|
Merge remote-tracking branch 'origin/90-pull' into 90-pull
|
2012-09-26 15:27:54 +06:00 |
Alexander Machehin
|
3491492c8d
|
[refs #90] fixed pull authorization
|
2012-09-26 15:24:46 +06:00 |
Vokhmin Alexey V
|
397d411252
|
#90: added #index action, updated routes
|
2012-09-26 00:50:40 +04:00 |
Vokhmin Alexey V
|
0299c069c6
|
#90: style changes for header, increase performanse for #autocomplete_base_project action
|
2012-09-25 19:18:22 +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 |
Vladimir Sharshov
|
06099a15b6
|
Merge pull request #657 from warpc/648-add-filters-to-projects-page
[refs #648]: Filters by owners in projects page
|
2012-09-25 03:41:11 -07:00 |
Vladimir Sharshov
|
c426f81abe
|
Merge pull request #656 from warpc/616-issues_and_comments
[refs #616] Markdown in issues descriptions and comments, ability to preview, help info about markdown, refactoring.
|
2012-09-25 03:37:44 -07:00 |
Vokhmin Alexey V
|
84378afc3d
|
#648: small code optimization
|
2012-09-25 13:36:50 +04:00 |
Vokhmin Alexey V
|
768f4b1dfb
|
#648: renamed parametr
|
2012-09-24 22:07:53 +04:00 |
Vokhmin Alexey V
|
9be978eb68
|
#648: updated models, JS, controller according to comments and discussions
|
2012-09-24 22:04:53 +04:00 |
Alexander Machehin
|
2c6d4bae9e
|
[refs #616] add error messages to ajax
|
2012-09-24 23:34:14 +06:00 |
Alexander Machehin
|
f4bbeaaa46
|
[refs #616] fixed 500 when failed to create comment
|
2012-09-24 23:01:04 +06:00 |
Vokhmin Alexey V
|
cee1ee6cb6
|
#648: small refactoring
|
2012-09-23 20:22:49 +04:00 |
konstantin.grabar
|
7812adfdbc
|
[refs #374] Add custom http basic auth for api
|
2012-09-21 23:15:56 +04:00 |
Vokhmin Alexey V
|
2406423483
|
#648: added filters to Projects page
|
2012-09-21 21:57:22 +04:00 |
konstantin.grabar
|
5bcebcf384
|
[refs #374] Add publish_without_qa field, fix some specs, update docs for auth
|
2012-09-21 18:30:40 +04:00 |
konstantin.grabar
|
e94c6f4f00
|
[refs #374] Merge master into 374-rest_api_for_builds
|
2012-09-21 13:20:04 +04:00 |
Vokhmin Alexey V
|
799a1464fb
|
#385: fixed
|
2012-09-20 18:26:26 +04:00 |
Vokhmin Alexey V
|
07f5224e76
|
#385: removed before_filter
|
2012-09-20 15:21:54 +04:00 |
Vokhmin Alexey V
|
c76618441e
|
#385: revert some changes according to discussion
|
2012-09-20 15:10:52 +04:00 |
Vokhmin Alexey V
|
9d2c9ae2b3
|
#385: added rsa to name of archives for git branches
|
2012-09-20 00:38:40 +04:00 |
Vokhmin Alexey V
|
f39adfd2f7
|
#385: fixed specs, updated controller, view
|
2012-09-19 23:29:36 +04:00 |
Alexander Machehin
|
daf845705a
|
[refs #616] comment update
|
2012-09-19 00:42:22 +06:00 |
Alexander Machehin
|
a492367a17
|
[refs #616] some fixes and refactoring
|
2012-09-18 16:00:21 +06:00 |
Alexander Machehin
|
a4c8e8eff8
|
Merge branch 'master' into 616-issues_and_comments
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/controllers/projects/projects_controller.rb
|
2012-09-17 16:52:50 +06:00 |
Vokhmin Alexey V
|
fe20814b5a
|
#633: hot fix
|
2012-09-13 20:18:09 +04:00 |
Vokhmin Alexey V
|
a99bfee4a6
|
#633: UI has been updated
|
2012-09-13 20:08:41 +04:00 |
Vladimir Sharshov
|
5a699ad379
|
Merge pull request #640 from warpc/638-add-access-permissions-for-users-to-repository
[refs #638] Repository supervisor
|
2012-09-12 13:52:42 -07:00 |
Vokhmin Alexey V
|
1c9a9e803e
|
#638: some refactoring
|
2012-09-13 00:47:39 +04:00 |
Vokhmin Alexey V
|
1a75a5a394
|
#638: updated Relation model, repositories and platforms controllers according to comments
|
2012-09-12 23:32:51 +04:00 |
Vladimir Sharshov
|
e3bcd2382e
|
[refs #641] Show only public projects in group profile
|
2012-09-12 18:49:40 +04:00 |
Vokhmin Alexey V
|
3b622f54b9
|
#638: added before_filter to repositories_controller
|
2012-09-12 17:43:02 +04:00 |
Vokhmin Alexey V
|
bc4043e558
|
#638: hot fix
|
2012-09-12 17:25:46 +04:00 |
Vokhmin Alexey V
|
b468b09529
|
#638: some refactoring for adding new user
|
2012-09-12 17:07:34 +04:00 |
Vokhmin Alexey V
|
1e40b9fb06
|
#638: some refactoring
|
2012-09-12 00:08:25 +04:00 |