OSDN Git Service
Valeriy Sizov [Mon, 22 Oct 2012 19:53:06 +0000 (22:53 +0300)]
API: help page and comment
Valeriy Sizov [Mon, 22 Oct 2012 18:59:46 +0000 (21:59 +0300)]
Changes after review
Valeriy Sizov [Sun, 21 Oct 2012 16:48:56 +0000 (19:48 +0300)]
API: merge request: post comment call
Valeriy Sizov [Sun, 21 Oct 2012 13:13:39 +0000 (16:13 +0300)]
API: MergeRequest: authorization
Valeriy Sizov [Sun, 21 Oct 2012 12:33:02 +0000 (15:33 +0300)]
API: MergeRequest refactoring
Valeriy Sizov [Sun, 21 Oct 2012 11:59:50 +0000 (14:59 +0300)]
API: update merge request call
Valeriy Sizov [Sun, 21 Oct 2012 11:41:06 +0000 (14:41 +0300)]
API: create merge request
Valeriy Sizov [Sun, 21 Oct 2012 11:00:27 +0000 (14:00 +0300)]
API:merge request show && list
randx [Mon, 22 Oct 2012 18:42:06 +0000 (21:42 +0300)]
More group tests with spinach
randx [Mon, 22 Oct 2012 18:21:34 +0000 (21:21 +0300)]
Fix issue with removing group
Dmitriy Zaporozhets [Mon, 22 Oct 2012 16:00:57 +0000 (19:00 +0300)]
up to 3.0.1
Dmitriy Zaporozhets [Mon, 22 Oct 2012 15:45:42 +0000 (18:45 +0300)]
Fix git over HTTP
Dmitriy Zaporozhets [Mon, 22 Oct 2012 12:49:03 +0000 (15:49 +0300)]
Up to v3.0.0
randx [Sun, 21 Oct 2012 17:29:19 +0000 (20:29 +0300)]
Log OutOfMemory exceptions from Merge Requests with GitLogger
Dmitriy Zaporozhets [Sun, 21 Oct 2012 16:13:35 +0000 (09:13 -0700)]
Merge pull request #1740 from godric7/master
Enable Oauth login for existing regular users
Dmitriy Zaporozhets [Sun, 21 Oct 2012 14:24:59 +0000 (07:24 -0700)]
Merge pull request #1605 from dosire/repo_clone_indicator
Rewrite build_url, use web_protocol for repo indicator.
Marin Jankovski [Tue, 2 Oct 2012 07:54:33 +0000 (09:54 +0200)]
Display https as repo clone indicator and prevent modification of web_protocol variable.
Rewrite build_url, use web_protocol for repo indicator.
Explicitly initialize custom port to make the logic obvious.
Dmitriy Zaporozhets [Sun, 21 Oct 2012 13:14:36 +0000 (06:14 -0700)]
Merge pull request #1564 from dosire/cookie_secure_setting
Secure and httponly options on cookie.
Dmitriy Zaporozhets [Sun, 21 Oct 2012 11:08:45 +0000 (04:08 -0700)]
Merge pull request #1717 from riyad/add-author-to-tree-listing
Update author info in tree listing
randx [Sun, 21 Oct 2012 09:12:14 +0000 (12:12 +0300)]
Security for online editor. Replace dev_access?, master_access? with can? method usage
Dmitriy Zaporozhets [Sun, 21 Oct 2012 07:37:13 +0000 (00:37 -0700)]
Merge pull request #1743 from riyad/fix-merging-bugs
Fix merging bugs
Riyad Preukschas [Sat, 20 Oct 2012 13:27:34 +0000 (15:27 +0200)]
Fix bug in MergeRequest#mark_as_unmergable
Riyad Preukschas [Sat, 20 Oct 2012 13:25:48 +0000 (15:25 +0200)]
Refactor Gitlab::Merge
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
Godric [Fri, 19 Oct 2012 21:38:07 +0000 (00:38 +0300)]
enable Oauth login for existing regular users
fix: https://github.com/gitlabhq/gitlabhq/issues/1620
Riyad Preukschas [Thu, 18 Oct 2012 18:53:35 +0000 (20:53 +0200)]
Update author info in tree view
Riyad Preukschas [Wed, 17 Oct 2012 15:02:51 +0000 (17:02 +0200)]
Add CommitDecorator#author_link
Riyad Preukschas [Wed, 17 Oct 2012 14:55:08 +0000 (16:55 +0200)]
Fix wrong parameter order in Team#team_member_by_name_or_email
Saito [Thu, 18 Oct 2012 10:00:43 +0000 (18:00 +0800)]
add shared repository doc.
Dmitriy Zaporozhets [Thu, 18 Oct 2012 07:28:47 +0000 (00:28 -0700)]
Merge pull request #1712 from riyad/use-gem-for-emoji
Use gem for Emoji
Dmitriy Zaporozhets [Thu, 18 Oct 2012 07:26:30 +0000 (00:26 -0700)]
Merge pull request #1695 from riyad/cleanup-note-observer-and-notifications
Code cleanup on NoteObserver and Notify
Dmitriy Zaporozhets [Thu, 18 Oct 2012 07:23:20 +0000 (00:23 -0700)]
Merge pull request #1727 from gitlabhq/fix_bug_wiki
Fix 500 error when project is empty
Riyad Preukschas [Sat, 13 Oct 2012 20:46:27 +0000 (22:46 +0200)]
Rename NoteObserver methods and clarify things
Riyad Preukschas [Sat, 13 Oct 2012 18:55:50 +0000 (20:55 +0200)]
Reorder and group methods in Notify mailer
Riyad Preukschas [Tue, 16 Oct 2012 14:26:40 +0000 (16:26 +0200)]
Fix use of Emoji
Riyad Preukschas [Tue, 16 Oct 2012 14:26:17 +0000 (16:26 +0200)]
Remove old Emoji code and images
Riyad Preukschas [Tue, 16 Oct 2012 14:20:16 +0000 (16:20 +0200)]
Add gemoji gem
Valeriy Sizov [Wed, 17 Oct 2012 20:59:42 +0000 (23:59 +0300)]
Fix 500 error when project is empty
randx [Wed, 17 Oct 2012 19:35:08 +0000 (22:35 +0300)]
Fixing broken test of project last_activity
randx [Wed, 17 Oct 2012 19:02:52 +0000 (22:02 +0300)]
Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard
randx [Wed, 17 Oct 2012 19:01:27 +0000 (22:01 +0300)]
v3.0.0pre. Updated gitlab_meta to 3.0. Extended changelog
Valeriy Sizov [Wed, 17 Oct 2012 13:14:20 +0000 (16:14 +0300)]
revert all wiki changes
Valeriy Sizov [Wed, 17 Oct 2012 12:21:16 +0000 (15:21 +0300)]
revert
Valeriy Sizov [Wed, 17 Oct 2012 12:17:27 +0000 (15:17 +0300)]
Wiki style: move styles to right place
Valeriy Sizov [Wed, 17 Oct 2012 12:09:16 +0000 (15:09 +0300)]
Wiki Style Fixing
Valeriy Sizov [Wed, 17 Oct 2012 10:08:12 +0000 (03:08 -0700)]
Merge pull request #1715 from riyad/use-font-awesome
Use Font Awsome for icons
Valeriy Sizov [Wed, 17 Oct 2012 09:27:40 +0000 (02:27 -0700)]
Merge pull request #1719 from SaitoWu/features/sharedRepository
add shared repository support
Saito [Wed, 17 Oct 2012 07:43:44 +0000 (15:43 +0800)]
add shared repository support
Valeriy Sizov [Tue, 16 Oct 2012 21:27:47 +0000 (00:27 +0300)]
WebEditor: Cancel button. Confirm #1705
Valeriy Sizov [Tue, 16 Oct 2012 21:15:49 +0000 (00:15 +0300)]
WebEditor: rename button save -> commit #1705
Valeriy Sizov [Tue, 16 Oct 2012 21:13:37 +0000 (00:13 +0300)]
WebEditor: show branch #1705
Valeriy Sizov [Tue, 16 Oct 2012 21:05:53 +0000 (14:05 -0700)]
Merge pull request #1713 from riyad/fix-issue-close-and-reopen-buttons
Fix issue close and reopen button text and styles
Valeriy Sizov [Tue, 16 Oct 2012 20:52:44 +0000 (23:52 +0300)]
WebEditor: fix unknown theme in production mode
Riyad Preukschas [Tue, 16 Oct 2012 18:48:32 +0000 (20:48 +0200)]
Import Font Awesome styles
Riyad Preukschas [Tue, 16 Oct 2012 18:27:44 +0000 (20:27 +0200)]
Add font-awesome-sass-rails gem
Riyad Preukschas [Tue, 16 Oct 2012 17:17:48 +0000 (19:17 +0200)]
Fix issues close and reopen button text and styles
Valeriy Sizov [Tue, 16 Oct 2012 11:03:38 +0000 (04:03 -0700)]
Merge pull request #1704 from riyad/small-file-edit-fixes
Small fixes for editing files
Riyad Preukschas [Mon, 15 Oct 2012 19:47:38 +0000 (21:47 +0200)]
Only allow editing text files
Riyad Preukschas [Tue, 16 Oct 2012 10:45:30 +0000 (12:45 +0200)]
Improve flash messages in tree#update
randx [Tue, 16 Oct 2012 06:48:55 +0000 (09:48 +0300)]
tree.readme method added
randx [Tue, 16 Oct 2012 06:43:22 +0000 (09:43 +0300)]
Fix plain text readme
Dmitriy Zaporozhets [Tue, 16 Oct 2012 06:33:49 +0000 (23:33 -0700)]
Merge pull request #1706 from riyad/refactor-tree-views-and-improve-consistency
Refactor tree views and improve consistency
Dmitriy Zaporozhets [Tue, 16 Oct 2012 06:23:36 +0000 (23:23 -0700)]
Merge pull request #1707 from riyad/remove-labels-from-mr-form
Remove redundant branch labels from MR form
Riyad Preukschas [Mon, 15 Oct 2012 22:57:15 +0000 (00:57 +0200)]
Make history link for trees look like action links for blobs
Riyad Preukschas [Mon, 15 Oct 2012 22:46:48 +0000 (00:46 +0200)]
Remove redundant branch labels from MR form
Fixes #1525
Riyad Preukschas [Mon, 15 Oct 2012 20:54:49 +0000 (22:54 +0200)]
Remove #history_path and #mb_size from TreeDecorator
Riyad Preukschas [Mon, 15 Oct 2012 21:42:08 +0000 (23:42 +0200)]
Fix offered links in tree/blob_actions partial
Riyad Preukschas [Mon, 15 Oct 2012 21:40:56 +0000 (23:40 +0200)]
Use tree/blob_actions partial for blame view and fix file name encoding
Riyad Preukschas [Mon, 15 Oct 2012 19:23:35 +0000 (21:23 +0200)]
Use shorthand as in TreeController#edit
Riyad Preukschas [Mon, 15 Oct 2012 19:04:54 +0000 (21:04 +0200)]
Display more accurate file size in tree/blob/download partial
Riyad Preukschas [Mon, 15 Oct 2012 19:04:26 +0000 (21:04 +0200)]
Display file size instead of mode in tree/blob partial
Riyad Preukschas [Mon, 15 Oct 2012 18:56:58 +0000 (20:56 +0200)]
Extract out tree/blob/* partials
Riyad Preukschas [Mon, 15 Oct 2012 18:51:03 +0000 (20:51 +0200)]
Extract tree/readme partial
Riyad Preukschas [Mon, 15 Oct 2012 20:08:00 +0000 (22:08 +0200)]
Extract tree/blob_actions partial
Riyad Preukschas [Mon, 15 Oct 2012 21:38:35 +0000 (23:38 +0200)]
Rename tree/tree_file partial to tree/blob
Dmitriy Zaporozhets [Mon, 15 Oct 2012 17:11:00 +0000 (10:11 -0700)]
Merge pull request #1692 from riyad/saner-note-methods
Small Note code cleanup
randx [Mon, 15 Oct 2012 16:52:10 +0000 (19:52 +0300)]
Merge branch 'web_editor'
randx [Mon, 15 Oct 2012 16:51:11 +0000 (19:51 +0300)]
Minor improve to UI and code formatting of gitlab web editor
Valeriy Sizov [Sun, 14 Oct 2012 15:25:27 +0000 (08:25 -0700)]
Merge pull request #1697 from riyad/fix-wiki-comment-notification
Fix link to wiki page in wiki comment notification
Riyad Preukschas [Sun, 14 Oct 2012 15:12:38 +0000 (17:12 +0200)]
Fix link to wiki page in wiki comment notification
Dmitriy Zaporozhets [Sun, 14 Oct 2012 15:11:25 +0000 (08:11 -0700)]
Merge pull request #1693 from SaitoWu/features/mr
Improve development experience.
Riyad Preukschas [Sat, 13 Oct 2012 19:21:56 +0000 (12:21 -0700)]
Merge pull request #1694 from robbkidd/fix_notification_of_wall_notes
Fix notification for notes on a wall. (regression)
Robb Kidd [Sat, 13 Oct 2012 18:37:36 +0000 (14:37 -0400)]
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.
Saito [Sat, 13 Oct 2012 16:13:28 +0000 (00:13 +0800)]
add rails-dev-tweaks for development env speed
Saito [Sat, 13 Oct 2012 16:02:01 +0000 (00:02 +0800)]
disable annoying rails assets log messages
Riyad Preukschas [Sat, 13 Oct 2012 14:23:12 +0000 (16:23 +0200)]
Make Note methods saner
Valeriy Sizov [Fri, 12 Oct 2012 17:27:50 +0000 (20:27 +0300)]
WebEditor: minor spinach fixes
Valeriy Sizov [Fri, 12 Oct 2012 17:12:35 +0000 (20:12 +0300)]
fix install manual after merge #1666
Valeriy Sizov [Fri, 12 Oct 2012 16:59:42 +0000 (19:59 +0300)]
WebEditor: commit message is required now
Valeriy Sizov [Fri, 12 Oct 2012 16:56:06 +0000 (19:56 +0300)]
WebEditor: spinach
Valeriy Sizov [Fri, 12 Oct 2012 14:14:52 +0000 (17:14 +0300)]
WebEditor: base implementation
Valeriy Sizov [Fri, 12 Oct 2012 11:06:12 +0000 (14:06 +0300)]
WebEditor: Check if save is possible
Valeriy Sizov [Thu, 11 Oct 2012 21:15:24 +0000 (00:15 +0300)]
WebEditor: sceleton
Dmitriy Zaporozhets [Wed, 10 Oct 2012 09:41:15 +0000 (12:41 +0300)]
Design improved
Valeriy Sizov [Tue, 9 Oct 2012 17:11:49 +0000 (20:11 +0300)]
WebEditor: integrated editor
Valeriy Sizov [Mon, 8 Oct 2012 15:54:51 +0000 (18:54 +0300)]
minor code style fixing
Valeriy Sizov [Mon, 8 Oct 2012 15:43:54 +0000 (18:43 +0300)]
WebEditor: base form
Dmitriy Zaporozhets [Fri, 12 Oct 2012 11:56:16 +0000 (04:56 -0700)]
Merge pull request #1683 from riyad/fix-events-for-deleted-things-again
Fix displaying events for deleted things on the dashboard (again)
Riyad Preukschas [Fri, 12 Oct 2012 11:37:44 +0000 (13:37 +0200)]
Fix displaying events for deleted things
Valeriy Sizov [Fri, 12 Oct 2012 10:08:14 +0000 (03:08 -0700)]
Merge pull request #1682 from riyad/improve-search-suggestions
Improve (static) suggestions in global search field
Valeriy Sizov [Fri, 12 Oct 2012 09:23:53 +0000 (02:23 -0700)]
Merge pull request #1685 from jozefvaclavik/master
Hooks API (List one hook & edit)