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
cc64f2a814
Common filtering for dashboard and group. Share partial search result partial
2013-01-07 20:52:43 +02:00
Dmitriy Zaporozhets
1724f45f46
Remove unused styles. Restyled Issues a bit
2013-01-05 14:49:08 +02:00
Dmitriy Zaporozhets
5a214ee6f1
Remove unused methods
2013-01-05 13:11:15 +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
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
Riyad Preukschas
654f10102e
Remove paging from all notes except the wall
2012-12-03 22:51:56 +01:00
Riyad Preukschas
6c6f415cae
Fix appending diff line notes
2012-12-03 22:51:55 +01:00
Dmitriy Zaporozhets
e376f31507
Admin can move project to ANY namespace. Updated permissions page
2012-12-04 22:48:24 +02:00
Dmitriy Zaporozhets
2a1c5cdf99
Only owner of current namespace can change project namespace
2012-12-04 22:06:55 +02:00
Dmitriy Zaporozhets
eb1004f789
Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces
2012-11-29 12:39:03 +02:00
Dmitriy Zaporozhets
a0aa0212a9
Removed feature: comments on wiki
2012-11-29 06:14:05 +03:00
Dmitriy Zaporozhets
8114d36caf
Merge pull request #1720 from coagulant/wiki_search
...
Wiki search
2012-11-07 03:51:20 -08:00
randx
d4e070cfad
Improve styles. Add merge request completness to milestone percentage
2012-10-29 22:40:00 +02:00
Sergio Visinoni
a7d0816933
Add Milestone information in Merge Requests
...
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
Merge Requests listing page
2012-10-26 16:12:40 +02:00
Dmitriy Zaporozhets
6d0dcb6614
Reduce max commit diff size. Added Commit::DIFF_SAFE_SIZE
2012-10-25 12:16:14 +03:00
Ilya Baryshev
e6524a919e
Wiki search
...
Very basic, using LIKE, and no search snippets.
2012-10-16 23:05:11 +04:00
Riyad Preukschas
3f72af9994
Make notes for merge requests include commit notes and add helpers
2012-10-10 12:06:30 +02:00
randx
679d0d6d76
Context refactoring. Move Issues list, Search logic to context
2012-10-09 22:09:46 +03:00
randx
9159be3a50
Fix MR diff comments. Fix wiki comments loading error
2012-09-15 09:49:21 +03:00
Riyad Preukschas
07eec9c66a
Update Notes JS for reversed notes
2012-09-14 21:41:57 +02:00
Riyad Preukschas
e802d00996
Completely redo loading of notes with JS
2012-09-14 21:41:56 +02:00
Riyad Preukschas
6ffec9a298
Update Note to load notes in the right order
2012-09-14 21:41:56 +02:00
randx
b9ff0c79b4
Changed filters to readable one. Styled some stuff
2012-08-30 22:15:34 +03:00
randx
731b6be9c9
Handle app crash on huge commits
2012-08-11 15:59:36 +03: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
00b280c3f9
Feature: Bulk Issues update
2012-07-28 03:35:43 +03:00
Dmitriy Zaporozhets
5926bbac12
Backend Refactoring
2012-07-31 08:32:49 +03:00
randx
61c85332d2
Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments
...
Conflicts:
app/controllers/admin/mailer_controller.rb
app/controllers/notes_controller.rb
2012-07-25 21:36:30 +03:00
Dmitriy Zaporozhets
3063af5adc
BaseContext
...
Controllers refactoring with contexts
Move commit compare logic to model
2012-07-20 08:39:34 +03:00
