OSDN Git Service

wvm/gitlab.git
11 years agoFix for git commit when nothing to commit.
David Barri [Thu, 8 Nov 2012 21:32:00 +0000 (08:32 +1100)]
Fix for git commit when nothing to commit.

Turns out git commit returns with 128 when user.name config not present.

11 years agoFixed issue with git commit silently failing.
David Barri [Wed, 7 Nov 2012 23:47:11 +0000 (10:47 +1100)]
Fixed issue with git commit silently failing.

Also updated status task and installation instuctions.

11 years agoup to 3.0.3 v3.0.3
Dmitriy Zaporozhets [Wed, 24 Oct 2012 13:13:20 +0000 (16:13 +0300)]
up to 3.0.3

11 years agoMerge branch 'feature/import_team_from_other_project' of dev.gitlabhq.com:gitlabhq
Valery Sizov [Wed, 24 Oct 2012 12:56:47 +0000 (12:56 +0000)]
Merge branch 'feature/import_team_from_other_project' of dev.gitlabhq.com:gitlabhq

11 years agoFix chrome issues list
Dmitriy Zaporozhets [Wed, 24 Oct 2012 12:25:08 +0000 (15:25 +0300)]
Fix chrome issues list

11 years agoSpinach feature
Dmitriy Zaporozhets [Wed, 24 Oct 2012 12:23:04 +0000 (15:23 +0300)]
Spinach feature

11 years agoHandle perfomance issue with team import. Model specs
Dmitriy Zaporozhets [Wed, 24 Oct 2012 11:52:17 +0000 (14:52 +0300)]
Handle perfomance issue with team import. Model specs

11 years agoFeature implemented
Dmitriy Zaporozhets [Wed, 24 Oct 2012 11:20:53 +0000 (14:20 +0300)]
Feature implemented

11 years agoMerge pull request #1781 from iamntz/autofocus_on_issues
Valeriy Sizov [Wed, 24 Oct 2012 11:11:18 +0000 (04:11 -0700)]
Merge pull request #1781 from iamntz/autofocus_on_issues

Added autofocus for issue title

11 years agoAdded autofocus for issue title
Staicu Ionut [Wed, 24 Oct 2012 11:06:10 +0000 (14:06 +0300)]
Added autofocus for issue title

11 years agov3.0.2 v3.0.2
Dmitriy Zaporozhets [Wed, 24 Oct 2012 09:41:47 +0000 (12:41 +0300)]
v3.0.2

11 years agoFix schema.rb
Dmitriy Zaporozhets [Wed, 24 Oct 2012 09:39:53 +0000 (12:39 +0300)]
Fix schema.rb

11 years agoUpdate doc/installation.md
Saito [Wed, 24 Oct 2012 08:28:32 +0000 (16:28 +0800)]
Update doc/installation.md

Git Smart HTTP protocol runs on `gitlab:gitlab`.

11 years agoFix 500 error on admin project if empty
Dmitriy Zaporozhets [Tue, 23 Oct 2012 08:29:47 +0000 (11:29 +0300)]
Fix 500 error on admin project if empty

11 years agoReduce line-height for commits diff lines
randx [Mon, 22 Oct 2012 20:49:21 +0000 (23:49 +0300)]
Reduce line-height for commits diff lines

11 years agoRestyled last push widget. Increased line-height for td in tables
randx [Mon, 22 Oct 2012 20:37:50 +0000 (23:37 +0300)]
Restyled last push widget. Increased line-height for td in tables

11 years agoMore group tests with spinach
randx [Mon, 22 Oct 2012 18:42:06 +0000 (21:42 +0300)]
More group tests with spinach

11 years agoFix issue with removing group
randx [Mon, 22 Oct 2012 18:21:34 +0000 (21:21 +0300)]
Fix issue with removing group

11 years agoup to 3.0.1 v3.0.1
Dmitriy Zaporozhets [Mon, 22 Oct 2012 16:00:57 +0000 (19:00 +0300)]
up to 3.0.1

11 years agoFix git over HTTP
Dmitriy Zaporozhets [Mon, 22 Oct 2012 15:45:42 +0000 (18:45 +0300)]
Fix git over HTTP

11 years agoUp to v3.0.0 v3.0.0
Dmitriy Zaporozhets [Mon, 22 Oct 2012 12:49:03 +0000 (15:49 +0300)]
Up to v3.0.0

11 years agoLog OutOfMemory exceptions from Merge Requests with GitLogger
randx [Sun, 21 Oct 2012 17:29:19 +0000 (20:29 +0300)]
Log OutOfMemory exceptions from Merge Requests with GitLogger

11 years agoMerge pull request #1740 from godric7/master
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

11 years agoMerge pull request #1605 from dosire/repo_clone_indicator
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.

11 years agoDisplay https as repo clone indicator and prevent modification of web_protocol variable.
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.

11 years agoMerge pull request #1564 from dosire/cookie_secure_setting
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.

11 years agoMerge pull request #1717 from riyad/add-author-to-tree-listing
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

11 years agoSecurity for online editor. Replace dev_access?, master_access? with can? method...
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

11 years agoMerge pull request #1743 from riyad/fix-merging-bugs
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

11 years agoFix bug in MergeRequest#mark_as_unmergable
Riyad Preukschas [Sat, 20 Oct 2012 13:27:34 +0000 (15:27 +0200)]
Fix bug in MergeRequest#mark_as_unmergable

11 years agoRefactor Gitlab::Merge
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

11 years agoenable Oauth login for existing regular users
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

11 years agoUpdate author info in tree view
Riyad Preukschas [Thu, 18 Oct 2012 18:53:35 +0000 (20:53 +0200)]
Update author info in tree view

11 years agoAdd CommitDecorator#author_link
Riyad Preukschas [Wed, 17 Oct 2012 15:02:51 +0000 (17:02 +0200)]
Add CommitDecorator#author_link

11 years agoFix wrong parameter order in Team#team_member_by_name_or_email
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

11 years agoadd shared repository doc.
Saito [Thu, 18 Oct 2012 10:00:43 +0000 (18:00 +0800)]
add shared repository doc.

11 years agoMerge pull request #1712 from riyad/use-gem-for-emoji
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

11 years agoMerge pull request #1695 from riyad/cleanup-note-observer-and-notifications
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

11 years agoMerge pull request #1727 from gitlabhq/fix_bug_wiki
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

11 years agoRename NoteObserver methods and clarify things
Riyad Preukschas [Sat, 13 Oct 2012 20:46:27 +0000 (22:46 +0200)]
Rename NoteObserver methods and clarify things

11 years agoReorder and group methods in Notify mailer
Riyad Preukschas [Sat, 13 Oct 2012 18:55:50 +0000 (20:55 +0200)]
Reorder and group methods in Notify mailer

11 years agoFix use of Emoji
Riyad Preukschas [Tue, 16 Oct 2012 14:26:40 +0000 (16:26 +0200)]
Fix use of Emoji

11 years agoRemove old Emoji code and images
Riyad Preukschas [Tue, 16 Oct 2012 14:26:17 +0000 (16:26 +0200)]
Remove old Emoji code and images

11 years agoAdd gemoji gem
Riyad Preukschas [Tue, 16 Oct 2012 14:20:16 +0000 (16:20 +0200)]
Add gemoji gem

11 years agoFix 500 error when project is empty
Valeriy Sizov [Wed, 17 Oct 2012 20:59:42 +0000 (23:59 +0300)]
Fix 500 error when project is empty

11 years agoFixing broken test of project last_activity
randx [Wed, 17 Oct 2012 19:35:08 +0000 (22:35 +0300)]
Fixing broken test of project last_activity

11 years agoAdded project has_one :last_event assoc. Fixed tab line-height after font-awesome...
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

11 years agov3.0.0pre. Updated gitlab_meta to 3.0. Extended changelog
randx [Wed, 17 Oct 2012 19:01:27 +0000 (22:01 +0300)]
v3.0.0pre. Updated gitlab_meta to 3.0. Extended changelog

11 years agorevert all wiki changes
Valeriy Sizov [Wed, 17 Oct 2012 13:14:20 +0000 (16:14 +0300)]
revert all wiki changes

11 years agorevert
Valeriy Sizov [Wed, 17 Oct 2012 12:21:16 +0000 (15:21 +0300)]
revert

11 years agoWiki style: move styles to right place
Valeriy Sizov [Wed, 17 Oct 2012 12:17:27 +0000 (15:17 +0300)]
Wiki style: move styles to right place

11 years agoWiki Style Fixing
Valeriy Sizov [Wed, 17 Oct 2012 12:09:16 +0000 (15:09 +0300)]
Wiki Style Fixing

11 years agoMerge pull request #1715 from riyad/use-font-awesome
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

11 years agoMerge pull request #1719 from SaitoWu/features/sharedRepository
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

11 years agoadd shared repository support
Saito [Wed, 17 Oct 2012 07:43:44 +0000 (15:43 +0800)]
add shared repository support

11 years agoWebEditor: Cancel button. Confirm #1705
Valeriy Sizov [Tue, 16 Oct 2012 21:27:47 +0000 (00:27 +0300)]
WebEditor: Cancel button. Confirm #1705

11 years agoWebEditor: rename button save -> commit #1705
Valeriy Sizov [Tue, 16 Oct 2012 21:15:49 +0000 (00:15 +0300)]
WebEditor: rename button save -> commit #1705

11 years agoWebEditor: show branch #1705
Valeriy Sizov [Tue, 16 Oct 2012 21:13:37 +0000 (00:13 +0300)]
WebEditor: show branch #1705

11 years agoMerge pull request #1713 from riyad/fix-issue-close-and-reopen-buttons
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

11 years agoWebEditor: fix unknown theme in production mode
Valeriy Sizov [Tue, 16 Oct 2012 20:52:44 +0000 (23:52 +0300)]
WebEditor: fix unknown theme in production mode

11 years agoImport Font Awesome styles
Riyad Preukschas [Tue, 16 Oct 2012 18:48:32 +0000 (20:48 +0200)]
Import Font Awesome styles

11 years agoAdd font-awesome-sass-rails gem
Riyad Preukschas [Tue, 16 Oct 2012 18:27:44 +0000 (20:27 +0200)]
Add font-awesome-sass-rails gem

11 years agoFix issues close and reopen button text and styles
Riyad Preukschas [Tue, 16 Oct 2012 17:17:48 +0000 (19:17 +0200)]
Fix issues close and reopen button text and styles

11 years agoMerge pull request #1704 from riyad/small-file-edit-fixes
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

11 years agoOnly allow editing text files
Riyad Preukschas [Mon, 15 Oct 2012 19:47:38 +0000 (21:47 +0200)]
Only allow editing text files

11 years agoImprove flash messages in tree#update
Riyad Preukschas [Tue, 16 Oct 2012 10:45:30 +0000 (12:45 +0200)]
Improve flash messages in tree#update

11 years agotree.readme method added
randx [Tue, 16 Oct 2012 06:48:55 +0000 (09:48 +0300)]
tree.readme method added

11 years agoFix plain text readme
randx [Tue, 16 Oct 2012 06:43:22 +0000 (09:43 +0300)]
Fix plain text readme

11 years agoMerge pull request #1706 from riyad/refactor-tree-views-and-improve-consistency
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

11 years agoMerge pull request #1707 from riyad/remove-labels-from-mr-form
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

11 years agoMake history link for trees look like action links for blobs
Riyad Preukschas [Mon, 15 Oct 2012 22:57:15 +0000 (00:57 +0200)]
Make history link for trees look like action links for blobs

11 years agoRemove redundant branch labels from MR form
Riyad Preukschas [Mon, 15 Oct 2012 22:46:48 +0000 (00:46 +0200)]
Remove redundant branch labels from MR form

Fixes #1525

11 years agoRemove #history_path and #mb_size from TreeDecorator
Riyad Preukschas [Mon, 15 Oct 2012 20:54:49 +0000 (22:54 +0200)]
Remove #history_path and #mb_size from TreeDecorator

11 years agoFix offered links in tree/blob_actions partial
Riyad Preukschas [Mon, 15 Oct 2012 21:42:08 +0000 (23:42 +0200)]
Fix offered links in tree/blob_actions partial

11 years agoUse tree/blob_actions partial for blame view and fix file name encoding
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

11 years agoUse shorthand as in TreeController#edit
Riyad Preukschas [Mon, 15 Oct 2012 19:23:35 +0000 (21:23 +0200)]
Use shorthand as in TreeController#edit

11 years agoDisplay more accurate file size in tree/blob/download partial
Riyad Preukschas [Mon, 15 Oct 2012 19:04:54 +0000 (21:04 +0200)]
Display more accurate file size in tree/blob/download partial

11 years agoDisplay file size instead of mode in tree/blob partial
Riyad Preukschas [Mon, 15 Oct 2012 19:04:26 +0000 (21:04 +0200)]
Display file size instead of mode in tree/blob partial

11 years agoExtract out tree/blob/* partials
Riyad Preukschas [Mon, 15 Oct 2012 18:56:58 +0000 (20:56 +0200)]
Extract out tree/blob/* partials

11 years agoExtract tree/readme partial
Riyad Preukschas [Mon, 15 Oct 2012 18:51:03 +0000 (20:51 +0200)]
Extract tree/readme partial

11 years agoExtract tree/blob_actions partial
Riyad Preukschas [Mon, 15 Oct 2012 20:08:00 +0000 (22:08 +0200)]
Extract tree/blob_actions partial

11 years agoRename tree/tree_file partial to tree/blob
Riyad Preukschas [Mon, 15 Oct 2012 21:38:35 +0000 (23:38 +0200)]
Rename tree/tree_file partial to tree/blob

11 years agoMerge pull request #1692 from riyad/saner-note-methods
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

11 years agoMerge branch 'web_editor'
randx [Mon, 15 Oct 2012 16:52:10 +0000 (19:52 +0300)]
Merge branch 'web_editor'

11 years agoMinor improve to UI and code formatting of gitlab 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

11 years agoMerge pull request #1697 from riyad/fix-wiki-comment-notification
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

11 years agoFix 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

11 years agoMerge pull request #1693 from SaitoWu/features/mr
Dmitriy Zaporozhets [Sun, 14 Oct 2012 15:11:25 +0000 (08:11 -0700)]
Merge pull request #1693 from SaitoWu/features/mr

Improve development experience.

11 years agoMerge pull request #1694 from robbkidd/fix_notification_of_wall_notes
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)

11 years agoFix notification for notes on a wall.
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.

11 years agoadd rails-dev-tweaks for development env speed
Saito [Sat, 13 Oct 2012 16:13:28 +0000 (00:13 +0800)]
add rails-dev-tweaks for development env speed

11 years agodisable annoying rails assets log messages
Saito [Sat, 13 Oct 2012 16:02:01 +0000 (00:02 +0800)]
disable annoying rails assets log messages

11 years agoMake Note methods saner
Riyad Preukschas [Sat, 13 Oct 2012 14:23:12 +0000 (16:23 +0200)]
Make Note methods saner

11 years agoWebEditor: minor spinach fixes
Valeriy Sizov [Fri, 12 Oct 2012 17:27:50 +0000 (20:27 +0300)]
WebEditor: minor spinach fixes

11 years agofix install manual after merge #1666
Valeriy Sizov [Fri, 12 Oct 2012 17:12:35 +0000 (20:12 +0300)]
fix install manual after merge #1666

11 years agoWebEditor: commit message is required now
Valeriy Sizov [Fri, 12 Oct 2012 16:59:42 +0000 (19:59 +0300)]
WebEditor: commit message is required now

11 years agoWebEditor: spinach
Valeriy Sizov [Fri, 12 Oct 2012 16:56:06 +0000 (19:56 +0300)]
WebEditor: spinach

11 years agoWebEditor: base implementation
Valeriy Sizov [Fri, 12 Oct 2012 14:14:52 +0000 (17:14 +0300)]
WebEditor: base implementation

11 years agoWebEditor: Check if save is possible
Valeriy Sizov [Fri, 12 Oct 2012 11:06:12 +0000 (14:06 +0300)]
WebEditor: Check if save is possible

11 years agoWebEditor: sceleton
Valeriy Sizov [Thu, 11 Oct 2012 21:15:24 +0000 (00:15 +0300)]
WebEditor: sceleton