Alexander Machehin
|
0e39aae1bf
|
[#343] use new ruby hash syntax
|
2014-01-21 10:51:49 +06:00 |
|
Alexander Machehin
|
e255c59261
|
[#29] remove iconv
|
2014-01-16 19:39:03 +06:00 |
|
Alexander Machehin
|
50735fc977
|
[#29] add iconv gem
|
2014-01-10 09:30:22 +06:00 |
|
Alexander Machehin
|
b0da168621
|
[#29] remove encode strings
|
2014-01-10 08:59:33 +06:00 |
|
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 |
Vokhmin Alexey V
|
04964f0171
|
Fixed: NoMethodError: undefined method contents for nil:NilClass
|
2013-11-25 23:09:33 +04:00 |
|
Vokhmin Alexey V
|
7a872078ed
|
#321: added rescue block into #run_mass_import
|
2013-11-18 16:31:48 +04:00 |
|
Vokhmin Alexey V
|
22b397b670
|
#321: move #run_mass_import into module
|
2013-11-18 15:27:59 +04:00 |
|
Alexander Machehin
|
7da70b5f12
|
[#277] profile projects 1 ver.
|
2013-09-08 17:56:43 +06:00 |
|
Vokhmin Alexey V
|
d317eeb413
|
#281: moved concerns into lib folder
|
2013-08-27 20:27:22 +04:00 |
|
Vokhmin Alexey V
|
a51b1e0e9f
|
#281: Show repodata creation logs
|
2013-08-27 19:43:30 +04:00 |
|
Vokhmin Alexey V
|
d0e748cce0
|
#231: added PlatformArchSetting model, migration, updated views
|
2013-07-24 18:43:41 +04:00 |
|
Vokhmin Alexey V
|
c9b7f890fa
|
#222: removed #restore_branch method
|
2013-07-23 17:29:41 +04: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
|
6f67b580c4
|
#222: added form for creating new branch
|
2013-07-22 15:27:14 +04:00 |
|
Vokhmin Alexey V
|
7880fa4625
|
#214: added specs for Project #restore_branch && #delete_branch
|
2013-07-15 17:52:13 +04:00 |
|
Vokhmin Alexey V
|
2b423e6a6e
|
#214: some refactoring of JS, added comments
|
2013-07-15 16:09:31 +04:00 |
|
Vokhmin Alexey V
|
5113e9d3d8
|
#214: fixed restore of branch
|
2013-07-12 18:30:15 +04:00 |
|
Vokhmin Alexey V
|
ffcdd26c66
|
#214: updated UI of PullRequest#show
|
2013-07-12 18:21:46 +04:00 |
|
Vokhmin Alexey V
|
e096fc1bde
|
#214: updated logic of deleting of branch
|
2013-07-11 17:50:22 +04:00 |
|
Vokhmin Alexey V
|
ff646af607
|
#214: create GitHook on delete of branch
|
2013-07-11 17:20:22 +04:00 |
|
Vokhmin Alexey V
|
2e33f0038a
|
#214: added ability to destroy branch
|
2013-07-11 17:03:02 +04:00 |
|
Vokhmin Alexey V
|
66fe5c11cf
|
#200: removed activity_feed_observer
|
2013-06-27 18:40:19 +04:00 |
|
Vokhmin Alexey V
|
72b2b637d1
|
#34: revert some changes, created UrlHelper
|
2013-05-16 22:50:18 +04:00 |
|
Vokhmin Alexey V
|
68f402e400
|
#34: added docs for Hooks
|
2013-05-16 12:45:27 +04:00 |
|
Vokhmin Alexey V
|
62b58cc62d
|
#34: disabled Jabber
|
2013-05-15 18:54:53 +04:00 |
|
Vokhmin Alexey V
|
67e0226b24
|
#34: updated Hook model
|
2013-04-25 19:27:48 +04:00 |
|
Vokhmin Alexey V
|
4c96629a28
|
#34: merge master into branch
|
2013-04-25 15:36:00 +04:00 |
|
Vokhmin Alexey V
|
015679b047
|
#73: merge master into branch
|
2013-04-23 17:21:10 +04:00 |
|
Vokhmin Alexey V
|
fedde197ca
|
#34: temporarily disabled hipchat
|
2013-04-17 16:05:33 +04:00 |
|
Vokhmin Alexey V
|
f8d0320d23
|
#34: added new hooks, some refactoring according to Alexander's comments
|
2013-04-15 17:34:11 +04:00 |
warpc
|
8fdcb33a83
|
Merge pull request #94 from abf/rosa-build:93-support-git-submodule
#93: Support git submodule
|
2013-04-11 14:15:47 +04:00 |
|
Alexander Machehin
|
ee289a9798
|
[#19] fix error with pull request
|
2013-04-11 16:01:11 +06:00 |
|
Vokhmin Alexey V
|
0bc804e69d
|
#93: added icon for submodule, fixed messages of Tree, Submodule, Blob
|
2013-04-10 15:40:11 +04:00 |
|
Alexander Machehin
|
49feaf9d73
|
[#19] can reference all users and groups
|
2013-04-10 16:23:27 +06:00 |
|
Alexander Machehin
|
8066c7144c
|
[#19] add hint to user
|
2013-04-10 02:10:27 +06:00 |
|
Alexander Machehin
|
24ad1485a6
|
[#19] support # for pull request too
|
2013-04-10 01:55:32 +06:00 |
|
Alexander Machehin
|
a22be98f9b
|
[#19] fixed commit reference
|
2013-04-09 16:46:26 +06:00 |
|
Alexander Machehin
|
923f06cc10
|
[#19] fix undefined local variable or method 'options'
|
2013-04-09 16:25:05 +06:00 |
|
Vokhmin Alexey V
|
38ce6115c2
|
#73: merge master into branch
|
2013-04-08 22:55:21 +04:00 |
|
Alexander Machehin
|
ff0d5733aa
|
[#19] fix error with pull request project
|
2013-04-09 00:45:46 +06:00 |
|
Alexander Machehin
|
7c94715a4e
|
[#19] fix url to pull request
|
2013-04-09 00:39:50 +06:00 |
|
Alexander Machehin
|
8a09770e9d
|
[#19] fix url to issue
|
2013-04-08 23:48:45 +06:00 |
|
Vokhmin Alexey V
|
588a7d8bab
|
#73: remove unnecessary code
|
2013-04-04 17:36:54 +04:00 |
|
Vokhmin Alexey V
|
9dcd08b868
|
#73: add owner_uname into Project
|
2013-04-04 01:06:13 +04:00 |
|
Vokhmin Alexey V
|
62ff6312b4
|
#73: Increatse performance for #autocomplete_to_project action
|
2013-04-03 20:03:52 +04:00 |
|
Alexander Machehin
|
1812857d1e
|
[#19] fix issue & pull request links'
|
2013-03-30 00:06:48 +06:00 |
|
Alexander Machehin
|
e78e73cae8
|
[#19] add gitlabhq markdown
|
2013-03-29 00:22:24 +06:00 |
|
Vokhmin Alexey V
|
e055d0080b
|
#29: removed hack for encoding
|
2013-03-18 15:36:16 +04:00 |