OSDN Git Service
Dmitriy Zaporozhets [Mon, 15 Apr 2013 16:01:02 +0000 (19:01 +0300)]
Init Gitlab::Git::Diff class
Dmitriy Zaporozhets [Mon, 15 Apr 2013 13:58:10 +0000 (16:58 +0300)]
Updated changelog. GitLab 5.1 is beta now
akzhan [Mon, 15 Apr 2013 13:53:19 +0000 (16:53 +0300)]
Git log follow support
Dmitriy Zaporozhets [Mon, 15 Apr 2013 13:29:55 +0000 (16:29 +0300)]
change user_spec to pass postgres
Dmitriy Zaporozhets [Fri, 12 Apr 2013 20:33:01 +0000 (20:33 +0000)]
Merge branch 'more-words' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 12 Apr 2013 20:31:42 +0000 (20:31 +0000)]
Merge branch 'wording-of-notification-setting' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Fri, 12 Apr 2013 15:46:11 +0000 (17:46 +0200)]
Should be singular.
Sytse Sijbrandij [Fri, 12 Apr 2013 15:17:29 +0000 (17:17 +0200)]
Improving grammar. Hat tip Jan Mauritz Faber.
Dmitriy Zaporozhets [Fri, 12 Apr 2013 09:35:17 +0000 (09:35 +0000)]
Merge branch 'move-issue-above-pr' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Fri, 12 Apr 2013 09:25:25 +0000 (11:25 +0200)]
Move issues first since people submitting PR's are more into the OpenSource thinking. Hat tip Yves Senn.
Dmitriy Zaporozhets [Fri, 12 Apr 2013 06:56:10 +0000 (09:56 +0300)]
Fix random failing test
Dmitriy Zaporozhets [Thu, 11 Apr 2013 20:54:20 +0000 (23:54 +0300)]
Disable mailer for spinach
Dmitriy Zaporozhets [Thu, 11 Apr 2013 09:54:26 +0000 (12:54 +0300)]
adopt tests to pass with new poltergeist
Dmitriy Zaporozhets [Thu, 11 Apr 2013 08:50:58 +0000 (11:50 +0300)]
disable mailer for Spinach
Dmitriy Zaporozhets [Thu, 11 Apr 2013 08:25:11 +0000 (11:25 +0300)]
disable capybra 2.1 ingore hidden elements
Dmitriy Zaporozhets [Thu, 11 Apr 2013 08:03:57 +0000 (11:03 +0300)]
Updated gems. Replaced gollum with gollum-lib
Dmitriy Zaporozhets [Thu, 11 Apr 2013 07:45:18 +0000 (10:45 +0300)]
Update capybara to 2.1, poltergeist to master
Dmitriy Zaporozhets [Thu, 11 Apr 2013 06:39:49 +0000 (09:39 +0300)]
remove yaml_db gem, Replace team members index route with team_index
Dmitriy Zaporozhets [Wed, 10 Apr 2013 20:48:40 +0000 (23:48 +0300)]
Fixing specs & spinach since Wiki model does not exists any more
Dmitriy Zaporozhets [Wed, 10 Apr 2013 20:28:42 +0000 (23:28 +0300)]
Specs refactoring to reduce test time. Disabled observers by default for specs
Dmitriy Zaporozhets [Wed, 10 Apr 2013 19:20:00 +0000 (22:20 +0300)]
Remove Wiki and db table since we use gollum now
Dmitriy Zaporozhets [Wed, 10 Apr 2013 17:48:21 +0000 (20:48 +0300)]
Remove wiki migrator. We dont need it any more. Users should migrate to 5.0 first
Dmitriy Zaporozhets [Wed, 10 Apr 2013 17:27:43 +0000 (20:27 +0300)]
Reduce notes_on_merge_requests_spec time from 3 min to 1min
Dmitriy Zaporozhets [Wed, 10 Apr 2013 17:00:56 +0000 (20:00 +0300)]
Cleanup gfm tests
Dmitriy Zaporozhets [Wed, 10 Apr 2013 16:14:26 +0000 (09:14 -0700)]
Merge pull request #3464 from jrmithdobbs/fix_overlapping_testcase_name
Fix overlapping test case names.
Dmitriy Zaporozhets [Wed, 10 Apr 2013 15:26:25 +0000 (18:26 +0300)]
Fixed random failing test
Dmitriy Zaporozhets [Wed, 10 Apr 2013 12:41:47 +0000 (15:41 +0300)]
backup/restore uploads
Dmitriy Zaporozhets [Wed, 10 Apr 2013 12:11:45 +0000 (15:11 +0300)]
Run rewrite-hooks after repos restore
Dmitriy Zaporozhets [Wed, 10 Apr 2013 11:38:04 +0000 (14:38 +0300)]
Use update_column to set :last_activity_at for project
Dmitriy Zaporozhets [Wed, 10 Apr 2013 11:35:44 +0000 (14:35 +0300)]
fix gollum git instructions. related to #3562
Dmitriy Zaporozhets [Wed, 10 Apr 2013 09:01:39 +0000 (02:01 -0700)]
Merge pull request #3557 from rgbkrk/grammar-showdown
s/was/were/ for plural subjects
Dmitriy Zaporozhets [Wed, 10 Apr 2013 08:53:14 +0000 (08:53 +0000)]
Merge branch 'improve-wording' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Wed, 10 Apr 2013 07:19:08 +0000 (09:19 +0200)]
Hat tip to Jan Mauritz Faber for his suggestions.
Kyle Kelley [Wed, 10 Apr 2013 02:43:02 +0000 (22:43 -0400)]
s/was/were/ for plural subjects
Dmitriy Zaporozhets [Tue, 9 Apr 2013 18:14:47 +0000 (21:14 +0300)]
Update sidekiq gem. Make event body color a bit lighter
Dmitriy Zaporozhets [Tue, 9 Apr 2013 17:58:58 +0000 (20:58 +0300)]
Merge branch 'Undev-feature/refactoring_scopes_pr'
Dmitriy Zaporozhets [Tue, 9 Apr 2013 17:58:47 +0000 (20:58 +0300)]
Improve migration AddLastActivityColumnIntoProject to use real last activity date if present
Dmitriy Zaporozhets [Tue, 9 Apr 2013 17:53:27 +0000 (20:53 +0300)]
Improve perfomance by using project.last_activity_at in project_last_activity helper
Dmitriy Zaporozhets [Tue, 9 Apr 2013 17:37:04 +0000 (20:37 +0300)]
Merge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq into Undev-feature/refactoring_scopes_pr
Conflicts:
db/schema.rb
Dmitriy Zaporozhets [Tue, 9 Apr 2013 16:29:45 +0000 (19:29 +0300)]
Include ruby 2.0 in travis
Dmitriy Zaporozhets [Tue, 9 Apr 2013 12:04:31 +0000 (15:04 +0300)]
Override Issue opened scope. Now reopened issues also included
Dmitriy Zaporozhets [Tue, 9 Apr 2013 08:17:24 +0000 (11:17 +0300)]
Fix missing initCheck for Issues page checkbox
Dmitriy Zaporozhets [Tue, 9 Apr 2013 07:14:11 +0000 (10:14 +0300)]
Fix badge image url to ci.gitlab.org
Douglas Huff [Sun, 7 Apr 2013 20:58:25 +0000 (13:58 -0700)]
Fix overlapping test case names.
Dmitriy Zaporozhets [Sun, 7 Apr 2013 18:22:23 +0000 (11:22 -0700)]
Merge pull request #3522 from dplarson/correct-install-docs
Install gems with user `git`, not `gitlab`
Dmitriy Zaporozhets [Sun, 7 Apr 2013 18:21:02 +0000 (11:21 -0700)]
Merge pull request #3538 from AeroNotix/patch-1
Fixed JSON description of system hook
Dmitriy Zaporozhets [Sun, 7 Apr 2013 18:18:48 +0000 (21:18 +0300)]
remove outdated routing specs
Dmitriy Zaporozhets [Sun, 7 Apr 2013 10:19:36 +0000 (13:19 +0300)]
refactor Issues.js. Remove unused actions. Respect filters while searching for issue
Dmitriy Zaporozhets [Sun, 7 Apr 2013 09:32:24 +0000 (12:32 +0300)]
Fixed mr filter tests
Dmitriy Zaporozhets [Sat, 6 Apr 2013 19:32:23 +0000 (22:32 +0300)]
Refactoring & restyle pagination:
- remove admin kaminari theme. Use gitlab theme everywhere
- use bootstrap styled for gitlab admin themes
- dont reload page when change issue filter
Aaron France [Sat, 6 Apr 2013 18:25:46 +0000 (21:25 +0300)]
Fixed JSON description of system hook
Fixed JSON description of system hook to accurately describe what is actually being sent.
Dmitriy Zaporozhets [Sat, 6 Apr 2013 18:21:09 +0000 (21:21 +0300)]
New entries in CHANGELOG
Dmitriy Zaporozhets [Sat, 6 Apr 2013 12:53:35 +0000 (15:53 +0300)]
Increase event title font size on dashboard activity feed
Dmitriy Zaporozhets [Sat, 6 Apr 2013 12:11:47 +0000 (15:11 +0300)]
apply redesigned MR list to dashboard, group etc
Dmitriy Zaporozhets [Sat, 6 Apr 2013 12:10:24 +0000 (15:10 +0300)]
Redesign issues, mr lists
Dmitriy Zaporozhets [Sat, 6 Apr 2013 11:35:17 +0000 (14:35 +0300)]
refactor scss, refove unused classes
Dmitriy Zaporozhets [Fri, 5 Apr 2013 18:21:53 +0000 (21:21 +0300)]
remove draper
Dmitriy Zaporozhets [Fri, 5 Apr 2013 18:20:11 +0000 (21:20 +0300)]
Backup/restore wiki repos too
Dmitriy Zaporozhets [Fri, 5 Apr 2013 18:03:39 +0000 (21:03 +0300)]
Restyle tags page
Dmitriy Zaporozhets [Fri, 5 Apr 2013 17:44:16 +0000 (20:44 +0300)]
separate rake task for migration and persistent one
Dmitriy Zaporozhets [Fri, 5 Apr 2013 16:48:56 +0000 (19:48 +0300)]
move old repositories dir to one with timestamp
Dmitriy Zaporozhets [Fri, 5 Apr 2013 16:47:45 +0000 (19:47 +0300)]
Use data[:commits] hash from event to render push info on dashboard
Dmitriy Zaporozhets [Fri, 5 Apr 2013 16:47:12 +0000 (19:47 +0300)]
Get rid of event decorator. Use event data hash instead commit objects to increase perfomance
Dmitriy Zaporozhets [Fri, 5 Apr 2013 16:01:19 +0000 (19:01 +0300)]
refactor backup/restore
Dmitriy Zaporozhets [Fri, 5 Apr 2013 13:19:05 +0000 (16:19 +0300)]
Prevent same branch in MR seeds
Dmitriy Zaporozhets [Fri, 5 Apr 2013 12:55:02 +0000 (15:55 +0300)]
Replace db:backup/restore with native mysq/pg solution
Dmitriy Zaporozhets [Fri, 5 Apr 2013 12:42:07 +0000 (15:42 +0300)]
Improve development fixtures
David Larson [Fri, 5 Apr 2013 01:35:36 +0000 (18:35 -0700)]
Install gems with user `git`, not `gitlab`.
Dmitriy Zaporozhets [Thu, 4 Apr 2013 20:31:26 +0000 (23:31 +0300)]
CHANGELOG
Dmitriy Zaporozhets [Thu, 4 Apr 2013 20:19:24 +0000 (23:19 +0300)]
Replace unicorn with Puma
Dmitriy Zaporozhets [Thu, 4 Apr 2013 19:11:51 +0000 (22:11 +0300)]
save each notification setting with ajax on change
Dmitriy Zaporozhets [Thu, 4 Apr 2013 19:11:15 +0000 (22:11 +0300)]
add notification level to UsersProject
Dmitriy Zaporozhets [Thu, 4 Apr 2013 08:05:21 +0000 (08:05 +0000)]
Merge branch 'improve-new-project-wait-message' of /home/git/repositories/gitlab/gitlabhq
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
Sytse Sijbrandij [Wed, 3 Apr 2013 19:28:19 +0000 (21:28 +0200)]
With gitlab-shell it is faster than 2 minutes.
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