deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3363 commits 6 branches 43 tags 25 MiB
Commit graph

3363 commits

This branch
This branch
All branches
Author SHA1 Message Date
Valeriy Sizov
2a750bf2ca Merge pull request #1704 from riyad/small-file-edit-fixes 
Small fixes for editing files
 2012-10-16 04:03:38 -07:00
Riyad Preukschas
8e8d82d49a Only allow editing text files 2012-10-16 12:45:48 +02:00
Riyad Preukschas
ad5a6a4ae1 Improve flash messages in tree#update 2012-10-16 12:45:30 +02:00
randx
76e1ca6430 tree.readme method added 2012-10-16 09:48:55 +03:00
randx
453b2ae68b Fix plain text readme 2012-10-16 09:43:22 +03:00
Dmitriy Zaporozhets
e8d6c3c1b6 Merge pull request #1706 from riyad/refactor-tree-views-and-improve-consistency 
Refactor tree views and improve consistency
 2012-10-15 23:33:49 -07:00
Dmitriy Zaporozhets
5509093f25 Merge pull request #1707 from riyad/remove-labels-from-mr-form 
Remove redundant branch labels from MR form
 2012-10-15 23:23:36 -07:00
Riyad Preukschas
866b9f6d91 Make history link for trees look like action links for blobs 2012-10-16 00:57:15 +02:00
Riyad Preukschas
763022d698 Remove redundant branch labels from MR form 
Fixes #1525
 2012-10-16 00:46:48 +02:00
Riyad Preukschas
536eb8e828 Remove #history_path and #mb_size from TreeDecorator 2012-10-15 23:42:44 +02:00
Riyad Preukschas
d40d2dd809 Fix offered links in tree/blob_actions partial 2012-10-15 23:42:08 +02:00
Riyad Preukschas
b80a019598 Use tree/blob_actions partial for blame view and fix file name encoding 2012-10-15 23:40:56 +02:00
Riyad Preukschas
f120e5a89a Use shorthand as in TreeController#edit 2012-10-15 23:40:23 +02:00
Riyad Preukschas
3304262c3d Display more accurate file size in tree/blob/download partial 2012-10-15 23:40:21 +02:00
Riyad Preukschas
d96a807db7 Display file size instead of mode in tree/blob partial 2012-10-15 23:40:18 +02:00
Riyad Preukschas
d060856044 Extract out tree/blob/* partials 2012-10-15 23:40:06 +02:00
Riyad Preukschas
1f4d8eac24 Extract tree/readme partial 2012-10-15 23:40:02 +02:00
Riyad Preukschas
5cff72ad1e Extract tree/blob_actions partial 2012-10-15 23:39:49 +02:00
Riyad Preukschas
2f05ab1491 Rename tree/tree_file partial to tree/blob 2012-10-15 23:38:35 +02:00
Dmitriy Zaporozhets
e84d90c1e7 Merge pull request #1692 from riyad/saner-note-methods 
Small Note code cleanup
 2012-10-15 10:11:00 -07:00
randx
bd5dbe14e4 Merge branch 'web_editor' 2012-10-15 19:52:10 +03:00
randx
809aefb828 Minor improve to UI and code formatting of gitlab web editor 2012-10-15 19:51:11 +03:00
Valeriy Sizov
c01b0fd5d4 Merge pull request #1697 from riyad/fix-wiki-comment-notification 
Fix link to wiki page in wiki comment notification
 2012-10-14 08:25:27 -07:00
Riyad Preukschas
e26acd52b2 Fix link to wiki page in wiki comment notification 2012-10-14 17:12:38 +02:00
Dmitriy Zaporozhets
d0146881f0 Merge pull request #1693 from SaitoWu/features/mr 
Improve development experience.
 2012-10-14 08:11:25 -07:00
Riyad Preukschas
fced9678ea Merge pull request #1694 from robbkidd/fix_notification_of_wall_notes 
Fix notification for notes on a wall. (regression)
 2012-10-13 12:21:56 -07:00
Robb Kidd
9588a23242 Fix notification for notes on a wall. 
The fact that Notes on Walls have a noteable_type value of "nil" got
lost in the refactoring of the observer.
 2012-10-13 14:37:36 -04:00
Saito
757b4bbc5c add rails-dev-tweaks for development env speed 2012-10-14 00:13:28 +08:00
Saito
8880c06d3b disable annoying rails assets log messages 2012-10-14 00:02:01 +08:00
Riyad Preukschas
b1461de993 Make Note methods saner 2012-10-13 16:23:12 +02:00
Valeriy Sizov
47d9732a07 WebEditor: minor spinach fixes 2012-10-12 20:28:06 +03:00
Valeriy Sizov
db3d90cbcb fix install manual after merge #1666 2012-10-12 20:12:35 +03:00
Valeriy Sizov
2a78ae60eb WebEditor: commit message is required now 2012-10-12 20:07:24 +03:00
Valeriy Sizov
358d7eff7d WebEditor: spinach 2012-10-12 20:07:24 +03:00
Valeriy Sizov
42bdfd021b WebEditor: base implementation 2012-10-12 20:07:24 +03:00
Valeriy Sizov
0b3e9fd218 WebEditor: Check if save is possible 2012-10-12 20:07:24 +03:00
Valeriy Sizov
e53b47b447 WebEditor: sceleton 2012-10-12 20:07:24 +03:00
Dmitriy Zaporozhets
02c83f122a Design improved 2012-10-12 20:07:24 +03:00
Valeriy Sizov
57e2b5ed1a WebEditor: integrated editor 2012-10-12 20:07:24 +03:00
Valeriy Sizov
3b5c7b6e9a minor code style fixing 2012-10-12 20:07:23 +03:00
Valeriy Sizov
f6a8e69449 WebEditor: base form 2012-10-12 20:07:23 +03:00
Dmitriy Zaporozhets
837972650c Merge pull request #1683 from riyad/fix-events-for-deleted-things-again 
Fix displaying events for deleted things on the dashboard (again)
 2012-10-12 04:56:16 -07:00
Riyad Preukschas
19560a4b5f Fix displaying events for deleted things 2012-10-12 13:37:44 +02:00
Valeriy Sizov
4083d01af6 Merge pull request #1682 from riyad/improve-search-suggestions 
Improve (static) suggestions in global search field
 2012-10-12 03:08:14 -07:00
Valeriy Sizov
89a349f9a5 Merge pull request #1685 from jozefvaclavik/master 
Hooks API (List one hook & edit)
 2012-10-12 02:23:53 -07:00
jozefvaclavik
96abbf02e3 Update spec/requests/api/projects_spec.rb 
Fixed mistake with updating project hook
 2012-10-12 11:30:39 +03:00
Dmitriy Zaporozhets
3950b8e8c7 Merge pull request #1680 from robbkidd/reduce_note_observer_complexity 
Reduce complexity: replace case statement with method lookup.
 2012-10-12 01:11:02 -07:00
jozefvaclavik
3f2e04254f Update projects_spec.rb for Hook list and edit 
Also (I think) I found few mistakes with snippets requests.
 2012-10-12 11:00:59 +03:00
jozefvaclavik
d0000e5c18 Update doc/api/projects.md for hooks API 
Added documentation for getting project hook and editing project hook.
 2012-10-12 10:38:15 +03:00
jozefvaclavik
cfbd0b4f26 Update CHANGELOG for updated hooks API 2012-10-12 10:31:57 +03:00