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 |
|
Dmitriy Zaporozhets
|
9773ccc451
|
sidekiq with green tests
|
2013-01-09 09:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
5a214ee6f1
|
Remove unused methods
|
2013-01-05 13:11:15 +02:00 |
|
|
Dmitriy Zaporozhets
|
e3d7ce2cc4
|
Tests are fixed now
|
2013-01-05 12:12:02 +02:00 |
|
|
Dmitriy Zaporozhets
|
9a88e4d184
|
Fix some tests. Use travis-ci 1.9.2
|
2013-01-05 00:43:32 +02:00 |
|
|
Dmitriy Zaporozhets
|
e16cebac3e
|
Fixed styles, ProjectHook specs etc
|
2013-01-05 00:35:38 +02:00 |
|
|
Dmitriy Zaporozhets
|
c6298678f5
|
use ui-box as for all
|
2013-01-04 23:35:31 +02:00 |
|
|
Dmitriy Zaporozhets
|
ef5b36eaaf
|
Fixed protected branches and file edit
|
2013-01-04 21:45:30 +02:00 |
|
|
Dmitriy Zaporozhets
|
afbdbb0c95
|
Rspec fixes
|
2013-01-04 18:50:31 +02:00 |
|
|
Dmitriy Zaporozhets
|
dccd8b6eaa
|
Continue refactoring. Use repostory and team
|
2013-01-04 08:43:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
39ba934c0a
|
REpostiry, Team models
|
2013-01-03 21:09:18 +02:00 |
|
|
Dmitriy Zaporozhets
|
e6c0673ef1
|
Rspec models Milestone, Commit, UsersProject
|
2013-01-03 19:11:14 +02:00 |
|
|
Dmitriy Zaporozhets
|
d6036f08aa
|
move activated? method to service
|
2013-01-03 09:52:14 +02:00 |
|
|
Dmitriy Zaporozhets
|
ce84e3f440
|
Fixed tests. added test for gitlab_ci_service model
|
2013-01-03 09:37:13 +02:00 |
|
|
Dmitriy Zaporozhets
|
e65731bb7e
|
Add concerns to autoload
|
2013-01-03 09:12:24 +02:00 |
|
|
Dmitriy Zaporozhets
|
40a956eb68
|
Few more fixes after removing roles
|
2013-01-03 00:01:08 +02:00 |
|
|
Dmitriy Zaporozhets
|
cac7723451
|
Get rid of roles
|
2013-01-02 23:35:11 +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
|
3ff131a747
|
Improve web hook data. Use clonable url in repo info
|
2012-12-23 01:10:57 +02:00 |
|
|
Dmitriy Zaporozhets
|
1ba28aaef8
|
Implement UsersProject project_access validation
|
2012-12-22 19:52:28 +02:00 |
|
|
Riyad Preukschas
|
19eb637419
|
Update uses of Gitolite.config.foo settings
|
2012-12-20 16:54:28 +01:00 |
|
|
Dmitriy Zaporozhets
|
9ada678819
|
Split commit_id and noteable_id for Note
|
2012-12-18 20:02:00 +02:00 |
|
|
Dmitriy Zaporozhets
|
592412992d
|
Account role spec
|
2012-12-16 18:27:16 +02:00 |
|
|
Dmitriy Zaporozhets
|
0f7d3f591c
|
Moving repositories spec to roles. Added missing spec for project
|
2012-12-15 12:32:09 +02:00 |
|
|
Dmitriy Zaporozhets
|
0ff468160e
|
Fixed event.allowed? with event.proper?
|
2012-12-14 21:54:49 +02:00 |
|
|
Dmitriy Zaporozhets
|
b01f8b63c2
|
added NamespacedProject role. Extended project info displayed for admin. Fixed project limit
|
2012-12-14 08:14:05 +03:00 |
|
|
Riyad Preukschas
|
8918d11379
|
Fix project hook spec
|
2012-12-10 21:00:10 +01:00 |
|
|
Dmitriy Zaporozhets
|
a350b52c9b
|
Rewrite project security model tests
|
2012-12-05 17:06:15 +02:00 |
|
|
Riyad Preukschas
|
ae067ee322
|
Fix vote counting
|
2012-12-03 22:51:56 +01:00 |
|
|
Dmitriy Zaporozhets
|
eb1004f789
|
Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces
|
2012-11-29 12:39:03 +02:00 |
|
|
Dmitriy Zaporozhets
|
f614ae8ef7
|
Increased test coverage
|
2012-11-21 07:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
47234ab367
|
Validate username. Gitlab::Regex added
|
2012-11-28 06:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
c31d48dd25
|
Allow project creation in scope of group for non-admin but group owners
|
2012-11-25 11:57:01 +02:00 |
|
|
Dmitriy Zaporozhets
|
65c470e843
|
Reannotated
|
2012-11-24 22:16:51 +02:00 |
|
|
Dmitriy Zaporozhets
|
e92b563acf
|
Fix model tests
|
2012-11-23 20:53:24 +02:00 |
|
|
Dmitriy Zaporozhets
|
2b683b0d0b
|
Ability to create project with namespace
|
2012-11-23 07: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
|
4d846c09b1
|
Fixed spec
|
2012-11-20 23:18:44 +02:00 |
|
|
Dmitriy Zaporozhets
|
93fdc4ca9d
|
Reannotated
|
2012-11-20 14:19:55 +02:00 |
|
|
Dmitriy Zaporozhets
|
8500743464
|
Post Receive Refactored. Service hooks also triggered now
|
2012-11-19 21:44:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
95c23b2f97
|
Annotated. schema updated
|
2012-11-19 21:24:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
c3b074acab
|
Service model and service hook
|
2012-11-20 11:33:49 +02:00 |
|
|
Riyad Preukschas
|
578cf89812
|
Fix specs
|
2012-11-14 01:20:37 +01:00 |
|
|
Dmitriy Zaporozhets
|
b28ab8962b
|
Merge pull request #1928 from kouno/cleanup-factories
Remove backward compatibility of factories.
|
2012-11-13 08:45:03 -08:00 |
|
Vincent Bonmalais
|
80fb38de7a
|
Remove backward compatibility of factories.
|
2012-11-13 22:27:45 +11:00 |
|
Dmitriy Zaporozhets
|
313595e171
|
Annotated
|
2012-11-07 17:32:39 +02:00 |
|
|
Dmitriy Zaporozhets
|
b7a9e41bd2
|
Handle perfomance issue with team import. Model specs
|
2012-10-24 14:52:17 +03:00 |
|
|
randx
|
db469ea3e6
|
Fixing broken test of project last_activity
|
2012-10-17 22:35:08 +03:00 |
|
|
randx
|
e0c43c46dd
|
Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard
|
2012-10-17 22:02:52 +03:00 |
|