Alex Denisov
05af5655a7
Merge branch 'master' into issue_status_changed_notifications
2012-08-29 11:21:14 +03:00
Alex Denisov
43cad71f1a
Duplicate code removed from IssueObserver#after_update
2012-08-29 10:50:35 +03:00
Alex Denisov
2cb0a62f7d
Notification sends to issue author and assignee if issue being reopened or closed
2012-08-29 10:48:17 +03:00
Alex Denisov
4d65532158
Issue_status_changed email added
2012-08-29 09:49:39 +03:00
Dmitriy Zaporozhets
8da05a4ff7
Merge pull request #1323 from tsigo/factory_girl
...
FactoryGirl and spec cleanup
2012-08-28 22:57:16 -07:00
Robert Speicher
1dda08486b
Only include StubbedRepository in Project model
2012-08-29 01:55:41 -04:00
randx
e5adca1b81
Preview as button. Disable note submit unless content
2012-08-29 08:13:38 +03:00
Dmitriy Zaporozhets
b9b63fc362
Merge pull request #1329 from tsigo/milestone_api_docs
...
Add milestone API docs to doc/README and views/help/api
2012-08-29 05:47:54 -07:00
Robert Speicher
8a49cdc3b4
Add milestone API docs to doc/README and views/help/api
...
Also removes `closed` attribute option from create action.
2012-08-29 08:45:00 -04:00
Dmitriy Zaporozhets
8d192adb38
Merge pull request #1328 from NARKOZ/api
...
add docs for Milestones API
2012-08-29 05:36:01 -07:00
Dmitriy Zaporozhets
14f5d1727a
Merge branch 'milestone_api' of https://github.com/tsigo/gitlabhq into tsigo-milestone_api
...
Conflicts:
spec/requests/api/issues_spec.rb
2012-08-29 15:35:12 +03:00
Nihad Abbasov
2458060120
add docs for Milestones API
2012-08-29 05:31:00 -07:00
Dmitriy Zaporozhets
adc71b6a6a
Fix test i broke with ssk key validation. Added Key.user_id as attr_protected
2012-08-29 07:58:22 +03:00
Dmitriy Zaporozhets
5afb16e496
Add ssh key validation
2012-08-29 07:13:29 +03:00
Robert Speicher
39ff033d1a
Remove pkey.example
2012-08-28 21:22:49 -04:00
Robert Speicher
a3a63eeb92
Remove all instances to 'gitlabhq_x' seed repositories from specs and features
...
We now need only one seed repo! Also cleans up the seeding script.
2012-08-28 21:22:49 -04:00
Robert Speicher
a39cfb5461
Simplify StubbedRepository after GitHost changes from master
2012-08-28 21:22:49 -04:00
Robert Speicher
77d06454ed
Simple model spec changes made possible by new factories
2012-08-28 21:22:49 -04:00
Robert Speicher
0bc9094058
Add deploy_key and personal_key factories
2012-08-28 21:22:49 -04:00
Robert Speicher
c9c1f76e00
All specs and features currently passing with FactoryGirl
2012-08-28 21:22:49 -04:00
Robert Speicher
4805c64f2a
Remove spec/factory and spec/factories
2012-08-28 20:30:50 -04:00
Robert Speicher
a04b919a4c
Add factory_girl_rails gem
2012-08-28 20:30:50 -04:00
randx
b03ee4666b
Handle invalid ssh exception
2012-08-29 00:44:26 +03:00
randx
c48c0f95b2
Gitlab::Gitolite final fixes. Seems like all functionality is working correctly now
2012-08-29 00:33:19 +03:00
randx
e8e8ca940b
Fixed access to removed method
2012-08-29 00:19:34 +03:00
randx
d6b2b4f069
fixed configure call within gitolite
2012-08-29 00:16:33 +03:00
randx
5d88cdd9b8
Merge branch 'refactor/githost'
2012-08-29 00:07:57 +03:00
randx
7cdc5b9e04
Use similar interface to access gitolite
...
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
2012-08-29 00:04:06 +03:00
Dmitriy Zaporozhets
aded7056fd
Merge pull request #1313 from LeonB/master
...
Fixed some hardcoded paths based on issue #1272
2012-08-28 07:00:55 -07:00
LeonB
ffdda12f66
Line not needed anymore
2012-08-28 14:18:49 +02:00
LeonB
05fa1f167c
Added hooks_path option example
2012-08-28 13:06:05 +02:00
Dmitriy Zaporozhets
aa708ed961
Simplify setup for nginx, initd with already predefined files
2012-08-28 13:47:13 +03:00
Dmitriy Zaporozhets
4fe438ce63
Merge pull request #1315 from fixe/patch-2
...
Fixed typo
2012-08-28 03:09:43 -07:00
Tiago Ribeiro
7a16572c0a
Fixed typo
2012-08-28 12:09:10 +02:00
LeonB
c81d4ab4a9
Fixed some hardcoded paths
...
New config option: git_hooks_path
2012-08-28 10:57:23 +02:00
Dmitriy Zaporozhets
04b2864b64
Merge pull request #1290 from riyad/improve-gfm-user-docs
...
Improve GFM user docs
2012-08-27 22:44:38 -07:00
Riyad Preukschas
1f1ce5fbd4
Revamp GFM user docs.
2012-08-27 21:20:26 +02:00
Riyad Preukschas
806695f491
Split and reformat markdown options and add refs to their docs.
...
Also add hard_wrap option.
2012-08-27 21:20:13 +02:00
Riyad Preukschas
58a581782b
Update forms to show consistent link to GFM.
2012-08-27 20:55:01 +02:00
Dmitriy Zaporozhets
2e836fa428
Merge pull request #1274 from wiggle/bulk_permissions_tasks
...
Rake tasks to assign permissions to users
2012-08-27 11:50:26 -07:00
Dmitriy Zaporozhets
607be412d4
Merge pull request #985 from timspin/fix-gitolite-refs
...
Adds refs to gitolite.conf with $ at the end
2012-08-27 11:13:13 -07:00
Dmitriy Zaporozhets
cb35a80e49
Merge pull request #993 from veprbl/fix_archiving_prefix
...
Download button: put files into a directory
2012-08-27 11:04:00 -07:00
Dmitriy Zaporozhets
cb6fcb6562
Merge pull request #1301 from Mikulas/help-web-hooks-typo
...
fix web hooks help view commit count off by one
2012-08-27 04:58:32 -07:00
Dmitriy Zaporozhets
65444ba311
Merge pull request #1307 from purwandi/master
...
use high quality icon on folder icon
2012-08-27 01:33:06 -07:00
Dmitriy Zaporozhets
cdefad8887
Merge pull request #1305 from AlexDenisov/project_access_notifications
...
Project access notifications
2012-08-26 23:40:55 -07:00
Purwandi
28cc4de267
Replace folder icon to use high quality
2012-08-27 12:43:28 +07:00
Alex Denisov
3c96d1f0e1
Send notification on update UserProject relation (access changed)
2012-08-27 00:32:03 +03:00
Alex Denisov
aaeb37419a
Send notifiation on create UserProject relation (access granted)
2012-08-27 00:13:03 +03:00
randx
867f46076e
No need to chown hooks in backup script any mroe
2012-08-26 01:40:01 +03:00
randx
2c32574ac3
Project git clone panel
2012-08-25 23:39:01 +03:00