Vokhmin Alexey V
|
a098e00a1a
|
Merge branch 'master' into 226-remove-API-calls-from-JS
Conflicts:
app/assets/javascripts/angularjs/controllers/project_refs_controller.js
config/routes.rb
|
2013-07-23 19:23:20 +04:00 |
|
avokhmin
|
a1bce13193
|
Merge pull request #229 from abf/rosa-build:angular_unbind_in_diff
Diff should be left alone by angular
|
2013-07-23 19:07:40 +04:00 |
avm
|
b6e5e3d4fb
|
Merge pull request #225 from abf/rosa-build:222-create-new-branch-on-web
#222: Create new branch on WEB
|
2013-07-23 19:05:10 +04:00 |
|
Alexander Machehin
|
b10b990b47
|
Diff should be left alone by angular
|
2013-07-23 20:30:34 +06:00 |
|
Vokhmin Alexey V
|
8f1d4e5118
|
#222: fixed specs
|
2013-07-23 18:19:31 +04:00 |
|
Vokhmin Alexey V
|
2a5d72550b
|
Merge branch 'master' into 222-create-new-branch-on-web
|
2013-07-23 17:41:50 +04:00 |
|
Vokhmin Alexey V
|
4d4260fb7f
|
#222: updated routes.rb
|
2013-07-23 17:41:05 +04:00 |
|
Vokhmin Alexey V
|
c9b7f890fa
|
#222: removed #restore_branch method
|
2013-07-23 17:29:41 +04:00 |
|
Vokhmin Alexey V
|
202ef4fe55
|
#226: rollback and fixed specs
|
2013-07-23 17:04:34 +04:00 |
|
Vokhmin Alexey V
|
157becb196
|
#226: removed API calls from JS
|
2013-07-23 16:29:35 +04:00 |
|
Vokhmin Alexey V
|
eb4d4806f4
|
#226: updated Branches and Tags views, JS, etc.
|
2013-07-23 14:07:39 +04:00 |
|
avokhmin
|
c738f78422
|
Merge pull request #227 from abf/rosa-build:redirect_to_issues
redirect from issue to the pull request and vice versa
|
2013-07-23 12:17:59 +04:00 |
|
Alexander Machehin
|
b215d5acd3
|
fix specs for 404
|
2013-07-23 01:27:55 +06:00 |
|
Alexander Machehin
|
0d37f4e88e
|
[#105] fix spec for update
|
2013-07-23 00:53:41 +06:00 |
|
Alexander Machehin
|
726913f987
|
[#105] fix specs for anonymous access
|
2013-07-23 00:53:19 +06:00 |
|
Alexander Machehin
|
b04c3ac547
|
[#105] fuuuu...
|
2013-07-23 00:52:40 +06:00 |
|
Vokhmin Alexey V
|
f69013329a
|
#222: removed unnecessary attrs
|
2013-07-22 21:21:51 +04:00 |
|
Alexander Machehin
|
854f324627
|
redirect from issue to pull request and vice versa
|
2013-07-22 22:54:59 +06:00 |
|
Alexander Machehin
|
5947030325
|
add some specs for redirecting from issues to pulls and vice versa
|
2013-07-22 21:19:25 +06:00 |
|
Vokhmin Alexey V
|
c935120398
|
#222: Added checking of sha according to Alexander's comment
|
2013-07-22 18:38:18 +04:00 |
|
Vokhmin Alexey V
|
079f8a955a
|
#222: init GitHook on creating branch from UI
|
2013-07-22 18:21:12 +04:00 |
|
Vokhmin Alexey V
|
6f748e9baf
|
#222: removed unnecessary code
|
2013-07-22 16:17:19 +04:00 |
|
Vokhmin Alexey V
|
0c1334aef7
|
#222: added specs for GitTree#create
|
2013-07-22 16:13:07 +04:00 |
|
Vokhmin Alexey V
|
6f67b580c4
|
#222: added form for creating new branch
|
2013-07-22 15:27:14 +04:00 |
|
avokhmin
|
c33588f620
|
Merge pull request #218 from abf/rosa-build:214-delete-and-restore-branches
#214: Delete/Restore branches
|
2013-07-22 12:41:20 +04:00 |
|
Vokhmin Alexey V
|
66ae2c8de3
|
Merge branch 'master' into 214-delete-and-restore-branches
|
2013-07-22 11:39:38 +04:00 |
|
Vokhmin Alexey V
|
196d6c2880
|
updated url of build list container
|
2013-07-19 22:20:27 +04:00 |
|
Vokhmin Alexey V
|
dfb867541c
|
#214: updated regexp in JS for removing branch
|
2013-07-19 21:14:42 +04:00 |
|
Vokhmin Alexey V
|
78a33727a6
|
#214: merge master into branch
|
2013-07-19 21:08:00 +04:00 |
|
avokhmin
|
186ff714ec
|
Merge pull request #223 from abf/rosa-build:221-display-platforms
#221: Display platforms of repositories where user is admin
|
2013-07-19 20:59:34 +04:00 |
|
avokhmin
|
af08c0ee98
|
Merge pull request #220 from abf/rosa-build:219-use-caching
#219: Increase performance: use caching
|
2013-07-19 20:58:35 +04:00 |
|
Vokhmin Alexey V
|
dc3186198a
|
#221: removed unnecessary code
|
2013-07-19 20:44:00 +04:00 |
|
Vokhmin Alexey V
|
0833a9698a
|
#214: refactoring of JS and views
|
2013-07-19 18:06:30 +04:00 |
|
Vokhmin Alexey V
|
cf436203d9
|
#214: updated version of angular-i18n gem
|
2013-07-19 16:58:23 +04:00 |
|
Vokhmin Alexey V
|
c44b4ffda2
|
#214: added "angular-i18n" gem, some refactoring
|
2013-07-19 16:34:55 +04:00 |
|
Vokhmin Alexey V
|
1fb472d416
|
#214: refactoring of Tree#destroy action according to Alexander's comments
|
2013-07-19 14:22:29 +04:00 |
|
Vokhmin Alexey V
|
e7c00740b0
|
#214: misprint
|
2013-07-19 14:18:04 +04:00 |
|
Vokhmin Alexey V
|
9ea47a1159
|
#214: update "Current branch/tag" on removing of branch
|
2013-07-19 14:16:36 +04:00 |
|
Vokhmin Alexey V
|
fd1f81c466
|
#214: update count of branches in repo_block of project
|
2013-07-19 13:21:01 +04:00 |
|
Vokhmin Alexey V
|
ac4690b14a
|
#214: rescue ajax errors
|
2013-07-18 22:11:45 +04:00 |
|
Vokhmin Alexey V
|
61e4154deb
|
#214: update list of refs on error
|
2013-07-18 22:02:18 +04:00 |
|
Vokhmin Alexey V
|
aadb77cf56
|
#214: Fixed: Cannot read property from_ref of null
|
2013-07-18 21:20:22 +04:00 |
|
Vokhmin Alexey V
|
e3cd73ddaf
|
#214: fixed angularjs Controllers
|
2013-07-18 21:00:32 +04:00 |
|
Vokhmin Alexey V
|
3a5c21d34b
|
#214: fixed JS error after precompile
|
2013-07-18 20:42:37 +04:00 |
|
Vokhmin Alexey V
|
0a8e04ab1c
|
Merge branch 'master' into 214-delete-and-restore-branches
|
2013-07-18 20:31:51 +04:00 |
|
Vokhmin Alexey V
|
d9df4bfa58
|
#219: rollback ability.rb
|
2013-07-18 20:30:49 +04:00 |
|
Vokhmin Alexey V
|
8795a46774
|
Merge branch 'master' into 219-use-caching
|
2013-07-18 20:26:31 +04:00 |
|
Vokhmin Alexey V
|
4bb163a71d
|
Added staging environment
|
2013-07-18 17:20:23 +04:00 |
|
Vokhmin Alexey V
|
1b314e8085
|
#221: added specs for Platform and Repositories controller
|
2013-07-17 19:33:58 +04:00 |
|
Vokhmin Alexey V
|
90b5c59582
|
#221: added speca for Repository API
|
2013-07-17 18:57:46 +04:00 |