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
|
baf591cc27
|
Fix network test and snippets expired
|
2013-01-05 23:49:01 +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
|
b01f8b63c2
|
added NamespacedProject role. Extended project info displayed for admin. Fixed project limit
|
2012-12-14 08:14:05 +03:00 |
|
|
Riyad Preukschas
|
494ae87840
|
Refactor discussion reply
|
2012-12-03 22:51:56 +01:00 |
|
Cyril
|
be18397d82
|
rename ProjectController to ProjectResourceController
|
2012-09-27 20:59:42 +02:00 |
|
|
Cyril
|
e563e948bb
|
Merge branch 'master' into simplify_controllers2
Conflicts:
app/controllers/commits_controller.rb
app/controllers/refs_controller.rb
|
2012-09-27 12:25:52 +02:00 |
|
Robert Speicher
|
5a5d214de4
|
Remove unused render_full_content filter
|
2012-09-26 16:32:22 -04:00 |
|
|
Cyril
|
078a8f0e66
|
factorize before_filters and layout for projects related controllers
|
2012-09-26 22:27:43 +02:00 |
|
|
Cyril
|
252d3a0c9d
|
remove duplicate before_filter
|
2012-09-25 22:38:11 +02: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
|
093159a868
|
Styled snippets. Raw button for snippet
|
2012-06-12 21:41:46 +03:00 |
|
|
Dmitriy Zaporozhets
|
292a41cbe2
|
Fixed comments for snippets. Tests fixed
|
2012-02-24 22:36:44 +02:00 |
|
|
Dmitriy Zaporozhets
|
8c40aab120
|
Abilities extended. Resources security improved
|
2012-02-22 00:31:18 +02:00 |
|
|
Dmitriy Zaporozhets
|
4d89322d67
|
Snippets - fixed after bootstrap
Project - restyled show page, removed info page
Repository - restyled show page, added download option
Tags - added download options
|
2012-02-08 01:00:49 +02:00 |
|
|
Dmitriy Zaporozhets
|
ccc9bed893
|
Abilities refactoring
|
2011-12-15 23:57:46 +02:00 |
|
gitlabhq
|
0903932320
|
updated
|
2011-11-01 11:22:16 +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
|
783ca89796
|
security improved
|
2011-10-17 13:39:03 +03:00 |
|
|
gitlabhq
|
9265de3d25
|
snippets are ready
|
2011-10-17 00:07:10 +03:00 |
|