OSDN Git Service
Dmitriy Zaporozhets [Thu, 4 Apr 2013 08:04:48 +0000 (08:04 +0000)]
Merge branch 'coherent-and-readable-starting-instructions' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 4 Apr 2013 07:55:43 +0000 (10:55 +0300)]
move faker to development group
Dmitriy Zaporozhets [Thu, 4 Apr 2013 07:53:39 +0000 (10:53 +0300)]
Remove user decorator
Dmitriy Zaporozhets [Thu, 4 Apr 2013 06:58:12 +0000 (09:58 +0300)]
Fix notes for commits inside MR being squashed in one discussion
Dmitriy Zaporozhets [Thu, 4 Apr 2013 06:50:18 +0000 (09:50 +0300)]
fix not inline comments being hidden cause line_code = ''
Dmitriy Zaporozhets [Thu, 4 Apr 2013 06:32:29 +0000 (09:32 +0300)]
Fix broken compare with deleted file in dff
Dmitriy Zaporozhets [Thu, 4 Apr 2013 06:26:24 +0000 (23:26 -0700)]
Merge pull request #3493 from wangdong/patch-2
Update user_team_manager.rb
Dmitriy Zaporozhets [Thu, 4 Apr 2013 05:57:07 +0000 (08:57 +0300)]
use badges for commits count in commits list
Dmitriy Zaporozhets [Wed, 3 Apr 2013 20:33:42 +0000 (23:33 +0300)]
Update test with new title
Dmitriy Zaporozhets [Wed, 3 Apr 2013 20:32:36 +0000 (23:32 +0300)]
show commits count when hover chart on stats page
Sytse Sijbrandij [Wed, 3 Apr 2013 19:43:12 +0000 (21:43 +0200)]
Make separation between production and development clearer.
Dmitriy Zaporozhets [Wed, 3 Apr 2013 19:37:07 +0000 (22:37 +0300)]
Fixed wrong order of arguments in network graph caused by refactoring
Dmitriy Zaporozhets [Wed, 3 Apr 2013 19:33:34 +0000 (22:33 +0300)]
move js code related to repo barchart to chart.js.coffee
Dmitriy Zaporozhets [Wed, 3 Apr 2013 19:14:07 +0000 (22:14 +0300)]
Fix bug MR notes not being loaded when navigate from diff tab
Dmitriy Zaporozhets [Wed, 3 Apr 2013 19:04:26 +0000 (22:04 +0300)]
Fix MR comment tests
Dmitriy Zaporozhets [Wed, 3 Apr 2013 18:21:24 +0000 (21:21 +0300)]
specs for repository tag_names, branch_names
Dmitriy Zaporozhets [Wed, 3 Apr 2013 18:17:50 +0000 (21:17 +0300)]
decorate commits in Gitlab::Git::repository with valid class
Dmitriy Zaporozhets [Wed, 3 Apr 2013 18:09:07 +0000 (21:09 +0300)]
keep same dir structure for specs as in lib/
Dmitriy Zaporozhets [Wed, 3 Apr 2013 18:05:10 +0000 (21:05 +0300)]
Refactoring and cleanup. Removed unused commit finders
Dmitriy Zaporozhets [Wed, 3 Apr 2013 15:36:37 +0000 (18:36 +0300)]
Dont show project limit sidebar if user can own 100+ more projects
Dmitriy Zaporozhets [Wed, 3 Apr 2013 14:37:34 +0000 (17:37 +0300)]
new issue link from issue show page
Dmitriy Zaporozhets [Wed, 3 Apr 2013 14:33:07 +0000 (17:33 +0300)]
lets color changed files in commit. Green font color for added files, red for removed
Dmitriy Zaporozhets [Wed, 3 Apr 2013 14:21:19 +0000 (17:21 +0300)]
Show commit amount per day on commits page
Dmitriy Zaporozhets [Wed, 3 Apr 2013 14:11:06 +0000 (17:11 +0300)]
Use correct links for View File in diff
Dmitriy Zaporozhets [Wed, 3 Apr 2013 14:08:11 +0000 (14:08 +0000)]
Merge branch 'roadmap-to-feedback' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 3 Apr 2013 14:06:28 +0000 (17:06 +0300)]
Fixed before_filter for edit
Dmitriy Zaporozhets [Wed, 3 Apr 2013 13:49:32 +0000 (16:49 +0300)]
Fix edit files since we use Gitlab::Git::Blob for files
Dmitriy Zaporozhets [Wed, 3 Apr 2013 13:31:28 +0000 (16:31 +0300)]
strip tags from user profile
Dmitriy Zaporozhets [Wed, 3 Apr 2013 13:12:41 +0000 (16:12 +0300)]
Merge branch 'feature/merge_request_serialize'
Dmitriy Zaporozhets [Wed, 3 Apr 2013 12:55:08 +0000 (15:55 +0300)]
Fixed API file raw functionality, Fixed tree controller tests. Added BlobController specs
Dmitriy Zaporozhets [Wed, 3 Apr 2013 07:06:31 +0000 (10:06 +0300)]
fixed blame and mr factory
Wang Dong [Wed, 3 Apr 2013 07:03:31 +0000 (15:03 +0800)]
Update user_team_manager.rb
Sytse Sijbrandij [Wed, 3 Apr 2013 07:00:01 +0000 (09:00 +0200)]
Roadmap is on the feedback forum.
Dmitriy Zaporozhets [Wed, 3 Apr 2013 06:32:17 +0000 (09:32 +0300)]
remove unnecessary decorations
Dmitriy Zaporozhets [Wed, 3 Apr 2013 06:26:38 +0000 (09:26 +0300)]
Proper routing. blobs for blobs, raw for send_data
Dmitriy Zaporozhets [Tue, 2 Apr 2013 19:39:37 +0000 (22:39 +0300)]
add alias for committed_date
Dmitriy Zaporozhets [Tue, 2 Apr 2013 19:37:20 +0000 (22:37 +0300)]
Gitlab::Git::Tree & Blob added
Dmitriy Zaporozhets [Tue, 2 Apr 2013 18:46:19 +0000 (21:46 +0300)]
serialize parent_ids in commit
Dmitriy Zaporozhets [Tue, 2 Apr 2013 18:30:36 +0000 (21:30 +0300)]
store commits for MR as array of hashes
Dmitriy Zaporozhets [Tue, 2 Apr 2013 11:35:46 +0000 (11:35 +0000)]
Merge branch 'advanced-notes' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 2 Apr 2013 11:30:32 +0000 (14:30 +0300)]
fix test
Dmitriy Zaporozhets [Tue, 2 Apr 2013 08:32:41 +0000 (11:32 +0300)]
reset st_commits before setting new value to prevent error when old st_commits is broken
Dmitriy Zaporozhets [Tue, 2 Apr 2013 08:23:06 +0000 (11:23 +0300)]
fix tabs features
Sytse Sijbrandij [Tue, 2 Apr 2013 05:52:47 +0000 (07:52 +0200)]
Adding special cases to the advanced setup notes.
Dmitriy Zaporozhets [Mon, 1 Apr 2013 19:53:07 +0000 (22:53 +0300)]
fix long names on wall
Dmitriy Zaporozhets [Mon, 1 Apr 2013 19:30:48 +0000 (22:30 +0300)]
nav views refactoring
Dmitriy Zaporozhets [Mon, 1 Apr 2013 18:37:39 +0000 (21:37 +0300)]
minor design improvements
Dmitriy Zaporozhets [Mon, 1 Apr 2013 18:25:50 +0000 (21:25 +0300)]
Fixed bug with non-displayed download button
Dmitriy Zaporozhets [Mon, 1 Apr 2013 18:16:52 +0000 (21:16 +0300)]
Fix notification issue
Dmitriy Zaporozhets [Mon, 1 Apr 2013 17:53:00 +0000 (20:53 +0300)]
Merge branch 'refactor/gitlab_git'
Dmitriy Zaporozhets [Mon, 1 Apr 2013 17:35:41 +0000 (20:35 +0300)]
Pass project into factory for teams tests
Dmitriy Zaporozhets [Mon, 1 Apr 2013 16:06:47 +0000 (19:06 +0300)]
fixed test using repo with commits but old factory
Dmitriy Zaporozhets [Mon, 1 Apr 2013 15:35:29 +0000 (18:35 +0300)]
fix tests
Dmitriy Zaporozhets [Mon, 1 Apr 2013 15:24:05 +0000 (18:24 +0300)]
fix facotries
Dmitriy Zaporozhets [Mon, 1 Apr 2013 15:16:08 +0000 (18:16 +0300)]
Use project_with_code factory where necessary
Dmitriy Zaporozhets [Mon, 1 Apr 2013 14:27:44 +0000 (17:27 +0300)]
Dont init repo on every create(:repo)
Dmitriy Zaporozhets [Mon, 1 Apr 2013 14:26:04 +0000 (07:26 -0700)]
Merge pull request #3462 from tsl0922/fix-reassign-error
fix: wrong number of arguments
Dmitriy Zaporozhets [Mon, 1 Apr 2013 13:56:25 +0000 (16:56 +0300)]
Project.repository should never be nil so you can call repository.exists? or repository.empty?
Also specify separate project factory for project with filled repo
Dmitriy Zaporozhets [Mon, 1 Apr 2013 13:04:35 +0000 (16:04 +0300)]
Use Gitlab::Git:: for git features across application
Dmitriy Zaporozhets [Mon, 1 Apr 2013 13:03:11 +0000 (16:03 +0300)]
added Gitlab::Git::Compare for git compare feature
Dmitriy Zaporozhets [Mon, 1 Apr 2013 13:02:54 +0000 (16:02 +0300)]
added Gitlab::Git::Blame for git blame feature
Dmitriy Zaporozhets [Mon, 1 Apr 2013 11:39:19 +0000 (14:39 +0300)]
define TestEnv and keep all global stubs in one place
tsl0922 [Mon, 1 Apr 2013 09:25:31 +0000 (17:25 +0800)]
fix: wrong argument number
Dmitriy Zaporozhets [Mon, 1 Apr 2013 06:21:31 +0000 (09:21 +0300)]
Fix stubbed repo
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:58:17 +0000 (23:58 +0300)]
remove unnecessary Commit.new
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:48:12 +0000 (23:48 +0300)]
Extend models functionality with old decorator methods. Use Repository model
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:47:26 +0000 (23:47 +0300)]
Remove decorator calls and methods from views. Repalace with helper calls when needed
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:46:54 +0000 (23:46 +0300)]
Move some decorator logic to helpers
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:46:25 +0000 (23:46 +0300)]
remove Tree/Commit decorator usage from controllers
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:45:58 +0000 (23:45 +0300)]
rake task to clear redis cache
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:45:38 +0000 (23:45 +0300)]
Add Repository model to proxy request to Gitlab::Git::Repositoty and decorate commits with Commit model
Dmitriy Zaporozhets [Sun, 31 Mar 2013 20:44:59 +0000 (23:44 +0300)]
Remove Commit & Tree decorators
Dmitriy Zaporozhets [Sun, 31 Mar 2013 16:00:45 +0000 (19:00 +0300)]
Decorate Gitlab::Git::Commit with Commit
Dmitriy Zaporozhets [Sun, 31 Mar 2013 15:50:17 +0000 (18:50 +0300)]
Fix tests and remove app/models/repository.rb
Dmitriy Zaporozhets [Sun, 31 Mar 2013 15:49:58 +0000 (18:49 +0300)]
Remove grit logic from app/
Dmitriy Zaporozhets [Sun, 31 Mar 2013 15:49:31 +0000 (18:49 +0300)]
specs for Gitlab::Git::Repository and Gitlab::Git::Commit
Dmitriy Zaporozhets [Sun, 31 Mar 2013 15:49:06 +0000 (18:49 +0300)]
Move Commit and Repository logic to lib/gitlab/git
Dmitriy Zaporozhets [Sun, 31 Mar 2013 14:08:10 +0000 (17:08 +0300)]
Use existing methods for branch names: Ex use @repository.branch_names instead of @repository.heads.map(&:name)
Dmitriy Zaporozhets [Sun, 31 Mar 2013 12:06:48 +0000 (12:06 +0000)]
Merge branch 'header-in-contributing-guide' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 31 Mar 2013 12:06:24 +0000 (12:06 +0000)]
Merge branch 'notes-in-installation-guide' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 31 Mar 2013 12:04:08 +0000 (15:04 +0300)]
Fix therubyracer dependencies
Sytse Sijbrandij [Sun, 31 Mar 2013 11:54:46 +0000 (13:54 +0200)]
Section for important notes.
Sytse Sijbrandij [Sun, 31 Mar 2013 11:48:49 +0000 (13:48 +0200)]
Improve header and wording.
Dmitriy Zaporozhets [Sun, 31 Mar 2013 08:32:33 +0000 (01:32 -0700)]
Merge pull request #3457 from jrmithdobbs/fix-freebsd-bundle-install
Update deps for therubyracer and libv8 resolve build issues on FreeBSD...
Douglas Huff [Sun, 31 Mar 2013 01:54:12 +0000 (18:54 -0700)]
Update deps for therubyracer and libv8 to resolve build issues on FreeBSD. Resolves Iussue#3446 .
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:10:26 +0000 (15:10 -0700)]
Merge pull request #3369 from hiroponz/display-note-count
Display note count on network graph.
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:10:08 +0000 (15:10 -0700)]
Merge pull request #3396 from Andrew8xx8/issue-button-fix
New issue button was not follows to external tracker if it is selected. ...
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:07:11 +0000 (15:07 -0700)]
Merge pull request #3392 from hiroponz/fix-non-ascii-char-username
Fix RoutingError when changing username to non ascii char.
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:05:29 +0000 (15:05 -0700)]
Merge pull request #3430 from logorrhea/master
Changed the word 'authentification' to 'authentication'
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:04:32 +0000 (15:04 -0700)]
Merge pull request #3428 from colindean/bug/assigned-team-typo
fix typo: shure -> sure
Dmitriy Zaporozhets [Sat, 30 Mar 2013 22:03:44 +0000 (15:03 -0700)]
Merge pull request #3406 from docwhat/in_projects
Fixed UsersProject.in_projects
Dmitriy Zaporozhets [Sat, 30 Mar 2013 14:46:56 +0000 (16:46 +0200)]
prevent exception when trying to edit empty project
Dmitriy Zaporozhets [Sat, 30 Mar 2013 14:36:15 +0000 (16:36 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sat, 30 Mar 2013 14:33:26 +0000 (16:33 +0200)]
use rollbacked version of grit to make gollum works
Dmitriy Zaporozhets [Sat, 30 Mar 2013 11:23:58 +0000 (13:23 +0200)]
slower animation for tree browsing
Dmitriy Zaporozhets [Sat, 30 Mar 2013 11:15:55 +0000 (11:15 +0000)]
Merge branch 'accepting-mr-in-uservoice' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 30 Mar 2013 11:06:06 +0000 (04:06 -0700)]
Merge pull request #3440 from evanwon/patch-2
Fixed: gitlab-shell version check error message
Dmitriy Zaporozhets [Sat, 30 Mar 2013 10:50:44 +0000 (12:50 +0200)]
Update a grit to newer version
Sytse Sijbrandij [Sat, 30 Mar 2013 10:35:35 +0000 (11:35 +0100)]
Removing duplication by putting everything in the readme. Allow us to close issues that deviate from the guidelines.
Dmitriy Zaporozhets [Fri, 29 Mar 2013 06:47:14 +0000 (08:47 +0200)]
Prevent gollum to overrride gitlab-grit gem. Use grit as instead so gollum uses it too. Fixes things with gpg singatured commits, etc.