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
|
5a214ee6f1
|
Remove unused methods
|
2013-01-05 13:11:15 +02:00 |
|
|
Dmitriy Zaporozhets
|
9a88e4d184
|
Fix some tests. Use travis-ci 1.9.2
|
2013-01-05 00:43:32 +02:00 |
|
|
Dmitriy Zaporozhets
|
39ba934c0a
|
REpostiry, Team models
|
2013-01-03 21:09:18 +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
|
9ada678819
|
Split commit_id and noteable_id for Note
|
2012-12-18 20:02:00 +02:00 |
|
|
Riyad Preukschas
|
ae067ee322
|
Fix vote counting
|
2012-12-03 22:51:56 +01: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 |
|
|
Riyad Preukschas
|
b1461de993
|
Make Note methods saner
|
2012-10-13 16:23:12 +02:00 |
|
Dmitriy Zaporozhets
|
41e53eb980
|
Annotated
|
2012-10-09 11:14:17 +03:00 |
|
Nihad Abbasov
|
83efcabc82
|
set activerecord whitelist_attributes to true
|
2012-09-26 11:18:35 -07:00 |
|
|
Riyad Preukschas
|
06c1a8a9ae
|
Make notes recognize downvotes
|
2012-09-08 16:05:48 +02:00 |
|
Robert Speicher
|
2faa4bba40
|
Update Note#upvote? to support emoji voting
|
2012-09-06 15:31:25 -04:00 |
|
|
Robert Speicher
|
97423a0bed
|
Add more coverage for model validations and associations
|
2012-08-29 11:36:02 -04:00 |
|
|
Robert Speicher
|
9e7d77cece
|
Remove annotations from specs
|
2012-08-29 10:44:34 -04:00 |
|
|
Robert Speicher
|
77d06454ed
|
Simple model spec changes made possible by new factories
|
2012-08-28 21:22:49 -04:00 |
|
|
Robert Speicher
|
7754189187
|
Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
|
2012-08-10 18:25:15 -04:00 |
|
|
randx
|
6abc649590
|
Reannotated
|
2012-06-26 21:23:09 +03:00 |
|
Robb Kidd
|
02924de3e1
|
Add method to Note to create notes about status changes.
|
2012-06-20 14:09:46 -04:00 |
|
Ariejan de Vroom
|
8d8b82127f
|
Count +1 votes in issue notes.
|
2012-03-14 15:31:31 +02:00 |
|
|
Dmitriy Zaporozhets
|
3676838dc9
|
Rspec test repo replaced.\nMerge Requests improved
|
2012-03-13 23:54:49 +02:00 |
|
|
Dmitriy Zaporozhets
|
1c62ec09b0
|
4 roles permission system
|
2012-02-16 09:03:55 +02:00 |
|
|
Dmitriy Zaporozhets
|
b4cc04d7e1
|
Commit diff fixes, per-line comments fixed
|
2012-01-25 21:10:09 +02:00 |
|
|
Dmitriy Zaporozhets
|
f4e3ec29c4
|
fixed commit commenting
|
2012-01-21 14:54:32 +02:00 |
|
|
Dmitriy Zaporozhets
|
1b8f082061
|
new access rights implemented
|
2011-12-07 10:04:57 +02:00 |
|
Drew
|
91d5a906f9
|
Resolved issue #235
|
2011-11-18 01:52:13 -05:00 |
|
|
Dmitriy Zaporozhets
|
4ecf17cf9a
|
annotated
|
2011-11-11 00:08:20 +02:00 |
|
|
Nihad Abbasov
|
d62200cad4
|
clean-up code
* Remove trailing whitespace
* Converts hard-tabs into two-space soft-tabs
* Remove consecutive blank lines
|
2011-10-26 18:46:25 +05:00 |
|
gitlabhq
|
9ba1224867
|
init commit
|
2011-10-09 00:36:38 +03:00 |
|