Dmitriy Zaporozhets
155703c613
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
...
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
2013-02-19 11:01:19 +02:00
Andrew8xx8
b607c70e8f
Additional tests added to Milestone
2013-02-18 14:43:50 +04:00
Andrew8xx8
1644117a1a
Issue uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
b45e9aefd3
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Jaakko Kantojärvi
27f4cf7542
Tests to validate that invalid keys are rejected
2013-02-17 21:31:20 +02:00
Andrew8xx8
839957cf56
Constants in Events looks good now
2013-02-13 15:48:16 +04:00
Andrew8xx8
9a22ac63ec
Dynamic values must be in blocks if FG
2013-02-12 10:54:56 +04:00
Dmitriy Zaporozhets
9ad5fbb416
user factory username over sequence
2013-01-28 17:46:24 +02:00
Riyad Preukschas
3022786948
Merge commit 'master' into discussions
...
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
Riyad Preukschas
74e48f070f
Smaller fixes
2013-01-15 00:27:26 +01:00
Riyad Preukschas
6c724ed96c
Fix factories
2013-01-02 21:31:48 +01:00
Dmitriy Zaporozhets
d431e43392
Fix few bugs and tests after refactoring ownership logic
2013-01-02 19:32:34 +02:00
Dmitriy Zaporozhets
00a1f5bc2c
Project has now correct owner and creator. Increased test coverage
2013-01-02 19:00:00 +02:00
Riyad Preukschas
db2c15369c
Merge branch 'master' into discussions
...
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
Dmitriy Zaporozhets
1ba28aaef8
Implement UsersProject project_access validation
2012-12-22 19:52:28 +02:00
Riyad Preukschas
ae067ee322
Fix vote counting
2012-12-03 22:51:56 +01:00
Dmitriy Zaporozhets
e750efd9fc
Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests
...
Diff and patch for commits and merge requests
2012-11-26 04:40:49 -08:00
Riyad Preukschas
267b18dead
Add specs for exporting merge requests as diff or patch
2012-11-25 00:06:53 +01:00
Dmitriy Zaporozhets
0e1635a68a
Fixing requests after namespaces. Fixed admin bug with access to project
2012-11-23 22:25:28 +02:00
Dmitriy Zaporozhets
e92b563acf
Fix model tests
2012-11-23 20:53:24 +02:00
Dmitriy Zaporozhets
470aa7675e
Fix project.code-related functionality
2012-11-23 21:31:09 +03:00
Dmitriy Zaporozhets
c50ec72b52
Deprecate code for Project. Use title and path
2012-11-23 21:11:09 +03:00
Dmitriy Zaporozhets
71214bee75
Move directory with project. Fixed all related path methods to use namespace
2012-11-22 22:41:26 +03:00
Dmitriy Zaporozhets
95c23b2f97
Annotated. schema updated
2012-11-19 21:24:05 +03:00
Vincent Bonmalais
80fb38de7a
Remove backward compatibility of factories.
2012-11-13 22:27:45 +11:00
Robb Kidd
16ceae895e
Separate observing of Note and MergeRequests
...
* Move is_assigned? and is_being_xx? methods to IssueCommonality
This is behavior merge requests have in common with issues. Moved
methods to IssueCommonality role. Put specs directly into
merge_request_spec because setup differs for issues and MRs
specifically in the "closed" factory to use.
* Add MergeRequestObserver. Parallels IssueObserver in almost every way.
Ripe for refactoring.
* Rename MailerObserver to NoteObserver
With merge request observing moved out of MailerObserver, all that
was left was Note logic. Renamed to NoteObserver, added tests and
updated application config for new observer names. Refactored
NoteObserver to use the note's author and not rely on current_user.
* Set current_user for MergeRequestObserver
IssueObserver and MergeRequestObserver are the only observers that
need a reference to the current_user that they cannot look up on
the objects they are observing.
2012-10-10 17:59:25 -04:00
Valery Sizov
9e80d2d4f7
Merge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq
2012-10-03 12:17:48 +00:00
Valeriy Sizov
b5f9d29f55
Merge pull request #1617 from dosire/reject-ssh-keys-that-break-gitolite
...
Reject ssh keys that break gitolite
2012-10-03 03:18:08 -07:00
Dmitriy Zaporozhets
d683ce5c10
refactored factory + fixed tests
2012-10-02 18:20:46 +03:00
randx
9cabe04368
tests for: Profile -> History
2012-09-27 23:23:11 +03:00
Robert Speicher
f1c6bd8df3
Factories - Format project path and code
2012-09-26 16:32:23 -04:00
Sytse Sijbrandij
f3ce02b5c9
Reject ssh keys that break gitolite.
...
Failing test.
Working check.
2012-09-24 16:48:10 +02:00
Dmitriy Zaporozhets
7c0a1068bf
Merge pull request #1363 from AlexDenisov/api_create_project_fixes
...
API create project fixes
2012-09-06 23:00:04 -07:00
Alex Denisov
b73d4419ea
json_spec added. Create project via REST API fixed
2012-09-04 09:38:48 +03:00
Robert Speicher
d29827433d
Update User#identifier to conform to Gitolite 2.x's user pattern
...
Also modifies the specs a bit because I can't help myself.
Closes #480
2012-09-04 00:20:17 -04:00
Robert Speicher
97423a0bed
Add more coverage for model validations and associations
2012-08-29 11:36:02 -04: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
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
Alex Denisov
aaeb37419a
Send notifiation on create UserProject relation (access granted)
2012-08-27 00:13:03 +03:00
Valeriy Sizov
86bd11cbd8
System Hooks: rspec
2012-07-19 00:25:10 +03:00
Valeriy Sizov
655418bed2
System hooks: fix broken tests
2012-07-19 00:25:10 +03:00
Nihad Abbasov
475d9f487f
use ffaker gem
2012-05-29 17:35:34 +05:00
Dmitriy Zaporozhets
d98b183361
first pack of tests for milestones
2012-04-09 01:01:42 +03:00
Dmitriy Zaporozhets
8ee0993fdf
Event & Wiki models specs
2012-03-28 22:53:45 +03:00
Dmitriy Zaporozhets
3676838dc9
Rspec test repo replaced.\nMerge Requests improved
2012-03-13 23:54:49 +02:00
Dmitriy Zaporozhets
dcdb2fdfdb
Observe issue, merge request, note creation - create event
2012-02-28 16:01:14 +02:00
vsizov
621bfdb4aa
wiki: rspec
2012-02-21 20:18:06 +03:00
