Alexander Machehin
|
0cb585ef71
|
Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
Gemfile
Gemfile.lock
app/controllers/activity_feeds_controller.rb
app/models/activity_feed_observer.rb
config/environments/development.rb
config/initializers/a_app_config.rb
config/initializers/airbrake.rb
lib/modules/models/git.rb
spec/controllers/activity_feeds_controller_spec.rb
spec/helpers/activity_feeds_helper_spec.rb
|
2014-01-10 08:31:31 +06:00 |
avokhmin
|
ccdf15bcad
|
Merge pull request #326 from abf/rosa-build:325-fork_project_with_another_name
#325 fork project with another name
|
2013-11-20 14:58:00 +04:00 |
Alexander Machehin
|
6932420678
|
Merge branch 'master' into 325-fork_project_with_another_name
Conflicts:
app/controllers/projects/projects_controller.rb
|
2013-11-19 17:18:30 +06:00 |
Alexander Machehin
|
188c3be355
|
[#325] add abibity to create fork with different name
|
2013-11-19 17:06:44 +06:00 |
Vokhmin Alexey V
|
0d247779b7
|
#322: updated routes.rb
|
2013-11-18 22:12:50 +04:00 |
Vokhmin Alexey V
|
dbf3f24b21
|
#321: added UI for mass_import
|
2013-11-14 02:01:12 +04:00 |
Vokhmin Alexey V
|
578c868ba1
|
#319: fixed routes errors
|
2013-11-12 21:13:05 +04:00 |
Vokhmin Alexey V
|
a7e908b102
|
#319: Added ability to mass adding projects to the repository
|
2013-11-12 16:04:40 +04:00 |
Vokhmin Alexey V
|
9d70588da9
|
#312: updated routes
|
2013-11-09 01:15:22 +04:00 |
Vokhmin Alexey V
|
0cbd5b21e5
|
#316: added new statuses for BuildList
|
2013-11-01 21:11:59 +04:00 |
Vokhmin Alexey V
|
2ce16e805d
|
#312: added #logs action, search build_lists by arches && platforms
|
2013-10-22 21:48:00 +04:00 |
Vokhmin Alexey V
|
7be0129361
|
#312: show user authentication_token
|
2013-10-16 21:30:40 +04:00 |
Vokhmin Alexey V
|
ce3650e03d
|
#312: added Api::V1::JobsController
|
2013-09-30 20:35:56 +04:00 |
Vokhmin Alexey V
|
5bebaca4f0
|
#291: added friendly_id
|
2013-09-01 19:33:09 +04:00 |
Alexander Machehin
|
5c6220a46d
|
try to stop bots (part2)
|
2013-08-28 21:15:28 +06:00 |
Alexander Machehin
|
01380be9a7
|
Revert "try stop bots"
This reverts commit e6238a7621 .
Conflicts:
app/assets/stylesheets/devise/registration.scss
|
2013-08-28 19:35:16 +06:00 |
Alexander Machehin
|
e6238a7621
|
try stop bots
|
2013-08-26 23:53:03 +06:00 |
Vokhmin Alexey V
|
55bc1a8096
|
#276: updated UI of platforms, some refactoring
|
2013-08-23 22:58:29 +04:00 |
Alexander Machehin
|
4185ed0a2b
|
Merge branch 'master' into 242-restart_last_build_list
Conflicts:
app/controllers/projects/build_lists_controller.rb
config/routes.rb
|
2013-08-06 19:59:32 +06:00 |
Vokhmin Alexey V
|
63a26553cd
|
#251: removed #search action
|
2013-08-05 16:52:15 +04:00 |
Vokhmin Alexey V
|
b3ab16ec09
|
#251: use AJAX for load data on BuildList#index page
|
2013-08-02 02:24:33 +04:00 |
Alexander Machehin
|
f416bd9071
|
[#242] use datatable
|
2013-08-01 23:18:46 +06:00 |
Vokhmin Alexey V
|
00ffc5ece6
|
abf/abf-ideas#83: changed type of #remove_repo_lock_file action, updated text messages
|
2013-07-29 17:14:55 +04:00 |
Vokhmin Alexey V
|
c996769a4b
|
abf/abf-ideas#83: small refactoring according to Alexander's comments
|
2013-07-29 16:24:41 +04:00 |
Vokhmin Alexey V
|
ad46e25654
|
#83: added #start_sync and #stop_sync actions into Repository API
|
2013-07-26 19:38:39 +04:00 |
Vokhmin Alexey V
|
8e879ef0c7
|
#83: added ability to lock repository
|
2013-07-26 18:41:39 +04:00 |
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 |
Vokhmin Alexey V
|
4d4260fb7f
|
#222: updated routes.rb
|
2013-07-23 17:41:05 +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 |
Vokhmin Alexey V
|
6f67b580c4
|
#222: added form for creating new branch
|
2013-07-22 15:27:14 +04:00 |
Vokhmin Alexey V
|
c79fbbd2d5
|
Merge branch 'master' into 214-delete-and-restore-branches
|
2013-07-13 00:31:52 +04:00 |
Vokhmin Alexey V
|
fe8e1216c5
|
#214: remove unnecessary code
|
2013-07-12 23:27:49 +04:00 |
Vokhmin Alexey V
|
ffcdd26c66
|
#214: updated UI of PullRequest#show
|
2013-07-12 18:21:46 +04:00 |
Vokhmin Alexey V
|
2e33f0038a
|
#214: added ability to destroy branch
|
2013-07-11 17:03:02 +04:00 |
Vokhmin Alexey V
|
d747ffd070
|
#214: updated #branches page, integrated AngularJS
|
2013-07-11 14:34:44 +04:00 |
Vokhmin Alexey V
|
d4c6c5edbc
|
#82: added Contents controller, logical model, views
|
2013-07-05 20:08:09 +04:00 |
Vokhmin Alexey V
|
f4c0bd8950
|
Merge branch 'master' into 192-hidden-platforms-and-tokens
|
2013-07-01 13:37:58 +04:00 |
Vokhmin Alexey V
|
999f99a75a
|
#192: added #allowed action to Platform API
|
2013-06-26 16:04:06 +04:00 |
Vokhmin Alexey V
|
874086e1ca
|
#192: added ability to change visibility of platform
|
2013-06-26 13:00:51 +04:00 |
Vokhmin Alexey V
|
fd66f243e1
|
#192: added Token model, migration, controller
|
2013-06-25 11:00:20 +04:00 |
Alexander Machehin
|
ebc278d65a
|
[#105] add merge action
|
2013-06-24 21:18:17 +06:00 |
Alexander Machehin
|
f16c84bb58
|
[#105] add commits action
|
2013-06-21 19:45:28 +06:00 |
Alexander Machehin
|
20056fbc31
|
many issue/pull fixes
|
2013-06-19 02:00:01 +06:00 |
Alexander Machehin
|
e343ba90aa
|
[#105] pulls api v1
|
2013-06-19 01:45:40 +06:00 |
Alexander Machehin
|
28b12b8c96
|
[#135] add publish & reject publish action
|
2013-06-10 17:26:12 +06:00 |
Vokhmin Alexey V
|
fb0e623e0b
|
#156: added specs for MassBuildController, some refactoring, updated access rights
|
2013-06-05 17:48:11 +04:00 |
Vokhmin Alexey V
|
237bd6affb
|
#156: update UI of MassBuild#new BuildList#new
|
2013-06-04 23:59:08 +04:00 |
warpc
|
0da9bfef74
|
Merge pull request #103 from abf/rosa-build:34-webhook
[refs #34]: Webhook
|
2013-05-17 18:39:27 +04:00 |
Alexander Machehin
|
f8f53b198b
|
[#98] create home controller; move activity, common issues/pull_requests & root pages here
|
2013-05-15 23:28:39 +06:00 |