OSDN Git Service
randx [Sat, 27 Oct 2012 08:24:11 +0000 (11:24 +0300)]
Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end
Conflicts:
app/views/issues/_form.html.haml
Dmitriy Zaporozhets [Sat, 27 Oct 2012 08:22:02 +0000 (01:22 -0700)]
Merge pull request #1841 from sectioneight/fix-postgres-documentation
Fix PostgreSQL setup instructions
Aiden Scandella [Fri, 26 Oct 2012 21:05:20 +0000 (14:05 -0700)]
Fix PostgreSQL setup instructions
The config skeleton for postgres is called `database.yml.postgresql`,
not `database.yml.postgres`.
randx [Fri, 26 Oct 2012 19:10:17 +0000 (22:10 +0300)]
we dont show commit message on tags page any more
randx [Fri, 26 Oct 2012 18:52:26 +0000 (21:52 +0300)]
Prevent grit from caching graph commits
Dmitriy Zaporozhets [Fri, 26 Oct 2012 16:00:09 +0000 (19:00 +0300)]
Restyle branches list. Remove unneccesary styles from tree avatar
Dmitriy Zaporozhets [Fri, 26 Oct 2012 15:37:12 +0000 (18:37 +0300)]
Restyled git tags page. Added truncated tags message
Dmitriy Zaporozhets [Fri, 26 Oct 2012 14:13:24 +0000 (17:13 +0300)]
Remove gitolite config sed because our gitolite fork already has it in sources
Saito [Fri, 26 Oct 2012 13:35:37 +0000 (06:35 -0700)]
Merge pull request #1827 from mgrobelin/master
grack auth bugfix: allow dots in reponame
Markus Grobelin [Fri, 26 Oct 2012 12:05:57 +0000 (14:05 +0200)]
grack: allow repositories to have dots in name, e.g. serverconfigs-example.com.git
Riyad Preukschas [Thu, 25 Oct 2012 21:49:49 +0000 (23:49 +0200)]
Fix typos in Gitlab::Merge
Riyad Preukschas [Mon, 22 Oct 2012 17:30:42 +0000 (19:30 +0200)]
Extract shared/clone_panel partial
Riyad Preukschas [Thu, 11 Oct 2012 21:41:49 +0000 (23:41 +0200)]
Extract search field into a partial
Riyad Preukschas [Thu, 25 Oct 2012 20:50:58 +0000 (13:50 -0700)]
Merge pull request #1814 from hardchor/patch-1
Some grammatical improvements
hardchor [Thu, 25 Oct 2012 20:11:06 +0000 (22:11 +0200)]
Some grammatical improvements
Nothing too dramatic, just some improvements.
Dmitriy Zaporozhets [Thu, 25 Oct 2012 10:49:31 +0000 (03:49 -0700)]
Merge pull request #1803 from gitlabhq/api_merge_request
Api for merge request
Valeriy Sizov [Thu, 25 Oct 2012 10:38:55 +0000 (13:38 +0300)]
API: review 2
Valeriy Sizov [Thu, 25 Oct 2012 10:19:18 +0000 (13:19 +0300)]
API: fix after review
Valeriy Sizov [Thu, 25 Oct 2012 10:13:01 +0000 (13:13 +0300)]
API: tests for merge_requests
Dmitriy Zaporozhets [Thu, 25 Oct 2012 09:36:54 +0000 (02:36 -0700)]
Merge pull request #1785 from dosire/update-developer-documentation
Refer developers to the vagrant vm and remove out of date documentation.
Dmitriy Zaporozhets [Thu, 25 Oct 2012 09:30:09 +0000 (12:30 +0300)]
Fix 500 error on tree view woth submodule
Dmitriy Zaporozhets [Thu, 25 Oct 2012 09:16:14 +0000 (12:16 +0300)]
Reduce max commit diff size. Added Commit::DIFF_SAFE_SIZE
Dmitriy Zaporozhets [Thu, 25 Oct 2012 08:59:41 +0000 (11:59 +0300)]
App docs
Dmitriy Zaporozhets [Thu, 25 Oct 2012 08:52:34 +0000 (11:52 +0300)]
Remove easy script cause its should be improved
Dmitriy Zaporozhets [Thu, 25 Oct 2012 08:49:31 +0000 (11:49 +0300)]
move installation docs under separate dir
randx [Thu, 25 Oct 2012 08:13:11 +0000 (11:13 +0300)]
Decouple requirements and install
randx [Wed, 24 Oct 2012 17:59:48 +0000 (20:59 +0300)]
refactor installation doc
randx [Wed, 24 Oct 2012 17:50:34 +0000 (20:50 +0300)]
version 2
randx [Wed, 24 Oct 2012 17:42:55 +0000 (20:42 +0300)]
Improved installation manual
Valeriy Sizov [Thu, 25 Oct 2012 08:27:41 +0000 (01:27 -0700)]
Merge pull request #1797 from sholden/patch-2
Fix broken Note scopes with lambdas, 4.0 compat
Scott Holden [Thu, 25 Oct 2012 04:54:15 +0000 (21:54 -0700)]
Fix broken Note scopes with lambdas, 4.0 compat
Without lambdas, Date.today will be evaluated in the class body.
For it to have a running scope of last week etc, it will need to
be evaluated each time the scope is called.
In Rails 4.0, lambdas will be required for all scopes, so not a bad
idea to go ahead and change them all now.
Sytse Sijbrandij [Wed, 24 Oct 2012 14:45:18 +0000 (16:45 +0200)]
Refer developers to the vagrant vm and remove out of date documentation.
Dmitriy Zaporozhets [Wed, 24 Oct 2012 13:13:20 +0000 (16:13 +0300)]
up to 3.0.3
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
Dmitriy Zaporozhets [Wed, 24 Oct 2012 12:25:08 +0000 (15:25 +0300)]
Fix chrome issues list
Dmitriy Zaporozhets [Wed, 24 Oct 2012 12:23:04 +0000 (15:23 +0300)]
Spinach feature
Dmitriy Zaporozhets [Wed, 24 Oct 2012 11:52:17 +0000 (14:52 +0300)]
Handle perfomance issue with team import. Model specs
Dmitriy Zaporozhets [Wed, 24 Oct 2012 11:20:53 +0000 (14:20 +0300)]
Feature implemented
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
Staicu Ionut [Wed, 24 Oct 2012 11:06:10 +0000 (14:06 +0300)]
Added autofocus for issue title
Dmitriy Zaporozhets [Wed, 24 Oct 2012 09:41:47 +0000 (12:41 +0300)]
v3.0.2
Dmitriy Zaporozhets [Wed, 24 Oct 2012 09:39:53 +0000 (12:39 +0300)]
Fix schema.rb
Saito [Wed, 24 Oct 2012 08:28:32 +0000 (16:28 +0800)]
Update doc/installation.md
Git Smart HTTP protocol runs on `gitlab:gitlab`.
Dmitriy Zaporozhets [Tue, 23 Oct 2012 08:29:47 +0000 (11:29 +0300)]
Fix 500 error on admin project if empty
randx [Mon, 22 Oct 2012 20:49:21 +0000 (23:49 +0300)]
Reduce line-height for commits diff lines
randx [Mon, 22 Oct 2012 20:37:50 +0000 (23:37 +0300)]
Restyled last push widget. Increased line-height for td in tables
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
Nihad Abbasov [Tue, 16 Oct 2012 12:09:09 +0000 (05:09 -0700)]
remove unnecessary snippets.js
Nihad Abbasov [Tue, 16 Oct 2012 11:57:13 +0000 (04:57 -0700)]
merge graph.js into projects.js
Nihad Abbasov [Tue, 16 Oct 2012 11:41:49 +0000 (04:41 -0700)]
remove unnecessary loader.js
Nihad Abbasov [Tue, 16 Oct 2012 11:01:40 +0000 (04:01 -0700)]
cleanup coffeescript code for mentions auto-complete
Nihad Abbasov [Fri, 12 Oct 2012 06:19:34 +0000 (23:19 -0700)]
use 'js-' prefix for behavioral 'gfm-input' class
Nihad Abbasov [Wed, 10 Oct 2012 13:41:20 +0000 (06:41 -0700)]
cleanup main.coffee
Nihad Abbasov [Wed, 10 Oct 2012 12:11:40 +0000 (05:11 -0700)]
fix typo in spec
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