Riyad Preukschas
|
d4e3664067
|
Fix bug in MergeRequest#mark_as_unmergable
|
2012-10-20 15:27:34 +02:00 |
|
|
Riyad Preukschas
|
122769e358
|
Refactor Gitlab::Merge
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
|
2012-10-20 15:25:48 +02:00 |
|
Saito
|
51ef5b9297
|
add shared repository doc.
|
2012-10-18 18:00:43 +08:00 |
|
Dmitriy Zaporozhets
|
c007325451
|
Merge pull request #1712 from riyad/use-gem-for-emoji
Use gem for Emoji
|
2012-10-18 00:28:47 -07:00 |
|
|
Dmitriy Zaporozhets
|
61e5fb6f37
|
Merge pull request #1695 from riyad/cleanup-note-observer-and-notifications
Code cleanup on NoteObserver and Notify
|
2012-10-18 00:26:30 -07:00 |
|
|
Dmitriy Zaporozhets
|
ca42e91e61
|
Merge pull request #1727 from gitlabhq/fix_bug_wiki
Fix 500 error when project is empty
|
2012-10-18 00:23:20 -07:00 |
|
|
Riyad Preukschas
|
413778b645
|
Rename NoteObserver methods and clarify things
|
2012-10-18 01:14:10 +02:00 |
|
|
Riyad Preukschas
|
853c69c48a
|
Reorder and group methods in Notify mailer
|
2012-10-18 01:14:09 +02:00 |
|
|
Riyad Preukschas
|
ce91014730
|
Fix use of Emoji
|
2012-10-18 01:10:35 +02:00 |
|
|
Riyad Preukschas
|
5d42d92c87
|
Remove old Emoji code and images
|
2012-10-18 01:10:35 +02:00 |
|
|
Riyad Preukschas
|
b42c53c2e5
|
Add gemoji gem
|
2012-10-18 01:10:35 +02:00 |
|
Valeriy Sizov
|
883d138f15
|
Fix 500 error when project is empty
|
2012-10-17 23:59:42 +03:00 |
|
|
randx
|
db469ea3e6
|
Fixing broken test of project last_activity
|
2012-10-17 22:35:08 +03:00 |
|
|
randx
|
e0c43c46dd
|
Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard
|
2012-10-17 22:02:52 +03:00 |
|
|
randx
|
a9a3480de9
|
v3.0.0pre. Updated gitlab_meta to 3.0. Extended changelog
|
2012-10-17 22:01:27 +03:00 |
|
|
Valeriy Sizov
|
8e989d4863
|
revert all wiki changes
|
2012-10-17 16:14:20 +03:00 |
|
|
Valeriy Sizov
|
7a0a552b43
|
revert
|
2012-10-17 15:21:16 +03:00 |
|
|
Valeriy Sizov
|
31f1cebe4b
|
Wiki style: move styles to right place
|
2012-10-17 15:17:27 +03:00 |
|
|
Valeriy Sizov
|
607d8b7970
|
Wiki Style Fixing
|
2012-10-17 15:09:16 +03:00 |
|
|
Valeriy Sizov
|
7166739086
|
Merge pull request #1715 from riyad/use-font-awesome
Use Font Awsome for icons
|
2012-10-17 03:08:12 -07:00 |
|
|
Valeriy Sizov
|
d8262573b8
|
Merge pull request #1719 from SaitoWu/features/sharedRepository
add shared repository support
|
2012-10-17 02:27:40 -07:00 |
|
|
Saito
|
83626d05cd
|
add shared repository support
|
2012-10-17 15:43:44 +08:00 |
|
|
Valeriy Sizov
|
372220d35b
|
WebEditor: Cancel button. Confirm #1705
|
2012-10-17 00:27:47 +03:00 |
|
|
Valeriy Sizov
|
234eb7a8e4
|
WebEditor: rename button save -> commit #1705
|
2012-10-17 00:15:56 +03:00 |
|
|
Valeriy Sizov
|
ec05d9daf9
|
WebEditor: show branch #1705
|
2012-10-17 00:13:45 +03:00 |
|
|
Valeriy Sizov
|
d21443d1c6
|
Merge pull request #1713 from riyad/fix-issue-close-and-reopen-buttons
Fix issue close and reopen button text and styles
|
2012-10-16 14:05:53 -07:00 |
|
|
Valeriy Sizov
|
8ee8f36f6e
|
WebEditor: fix unknown theme in production mode
|
2012-10-16 23:52:44 +03:00 |
|
|
Riyad Preukschas
|
789e4b848c
|
Import Font Awesome styles
|
2012-10-16 20:48:32 +02:00 |
|
|
Riyad Preukschas
|
30a31d63da
|
Add font-awesome-sass-rails gem
|
2012-10-16 20:27:44 +02:00 |
|
|
Riyad Preukschas
|
fa4c38f32b
|
Fix issues close and reopen button text and styles
|
2012-10-16 19:17:48 +02:00 |
|
|
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 |
|