Riyad Preukschas
|
d28176b132
|
Replace commit diff note request specs with spinach features
|
2013-01-15 00:52:57 +01:00 |
|
|
Riyad Preukschas
|
f8e1f4a7c9
|
Replace commit note request specs with spinach features
|
2013-01-15 00:52:55 +01: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
|
8ee5fce9d6
|
Add preliminary specs for notes on merge requests
|
2013-01-15 00:27:59 +01:00 |
|
|
Riyad Preukschas
|
74e48f070f
|
Smaller fixes
|
2013-01-15 00:27:26 +01:00 |
|
Dmitriy Zaporozhets
|
9773ccc451
|
sidekiq with green tests
|
2013-01-09 09:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
2f6603e581
|
A bit of spinach tests
|
2013-01-09 08:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
31e3dc600a
|
Fix routing specs
|
2013-01-09 09:47:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
92a619ad28
|
organize simplecov
|
2013-01-07 22:23:13 +02:00 |
|
|
Riyad Preukschas
|
8c604c9d31
|
Add specs for notes on wall
|
2013-01-05 22:58:36 +01:00 |
|
|
Riyad Preukschas
|
1883e0830c
|
Add specs for notes on commits
|
2013-01-05 22:58:27 +01: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
|
de6fa5dd52
|
Fix security spec
|
2013-01-05 00:49:43 +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
|
2095780f24
|
fix tests
|
2013-01-03 12:37:12 +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 |
|
|
Riyad Preukschas
|
6c724ed96c
|
Fix factories
|
2013-01-02 21:31:48 +01:00 |
|
|
Dmitriy Zaporozhets
|
67896ea9a2
|
Fixed missing current user for issue observer
|
2013-01-02 20:25:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
ccf0686b01
|
Fix api specs. Use id instead path
|
2013-01-02 19:46:06 +02: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 |
|
|
Dmitriy Zaporozhets
|
ffe064a2c1
|
Bit of cleanup and improving mailer
|
2012-12-31 19:46:40 +02:00 |
|
|
Dmitriy Zaporozhets
|
c8ba5c2d58
|
Fix routing issues when navigating over tree, commits etc
|
2012-12-25 06:14:05 +03: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
|
fa8f834374
|
Fix import rake task and tests
|
2012-12-23 00:15:48 +02:00 |
|
|
Dmitriy Zaporozhets
|
1ba28aaef8
|
Implement UsersProject project_access validation
|
2012-12-22 19:52:28 +02:00 |
|
|
Dmitriy Zaporozhets
|
2398af9ab0
|
Fixed wierd gitlab markdown issue
|
2012-12-22 14:18:40 +02:00 |
|
|
Dmitriy Zaporozhets
|
b510f8c496
|
Fixed tests
|
2012-12-21 13:37:44 +02:00 |
|
|
Dmitriy Zaporozhets
|
a567d596f8
|
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
Fix and refactoring gfm_autocomplete
|
2012-12-21 02:47:55 -08:00 |
|
Valeriy Sizov
|
77d632890b
|
refactoring gfm_autocomplete
|
2012-12-20 20:52:12 +02:00 |
|
|
Riyad Preukschas
|
757c7a5291
|
Fix gravatar and ldap config
|
2012-12-20 16:54:28 +01:00 |
|
|
Riyad Preukschas
|
19eb637419
|
Update uses of Gitolite.config.foo settings
|
2012-12-20 16:54:28 +01:00 |
|
|
Dmitriy Zaporozhets
|
adb17d6052
|
Cleanup after issues refactor and fix test
|
2012-12-20 15:39:54 +02:00 |
|
|
Dmitriy Zaporozhets
|
2f7effe804
|
Refactor issues, Remove ajax
|
2012-12-19 06:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
552c6d4598
|
Make tests green for postgres
|
2012-12-18 20:43:44 +02: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 |
|