OSDN Git Service
Sato Hiroyuki [Wed, 23 Jan 2013 12:34:19 +0000 (21:34 +0900)]
Improve network graph
Dmitriy Zaporozhets [Wed, 23 Jan 2013 06:38:59 +0000 (22:38 -0800)]
Merge pull request #2695 from earzur/hotfix/fix_import_refactoring
[import] - fix project import after refactoring
Erwan Arzur [Tue, 22 Jan 2013 18:07:11 +0000 (19:07 +0100)]
[import] - fix project import after refactoring
Dmitriy Zaporozhets [Tue, 22 Jan 2013 17:55:01 +0000 (19:55 +0200)]
Merge branch 'features/profile_page'
Dmitriy Zaporozhets [Tue, 22 Jan 2013 17:54:45 +0000 (19:54 +0200)]
changelog
Dmitriy Zaporozhets [Tue, 22 Jan 2013 17:45:13 +0000 (19:45 +0200)]
Fix routing. Finalize user show page
Dmitriy Zaporozhets [Tue, 22 Jan 2013 17:05:01 +0000 (19:05 +0200)]
base implementation
Dmitriy Zaporozhets [Tue, 22 Jan 2013 15:58:40 +0000 (17:58 +0200)]
Merge branch 'features/help_with_index'
Dmitriy Zaporozhets [Tue, 22 Jan 2013 15:58:09 +0000 (17:58 +0200)]
Help with index
Valeriy Sizov [Tue, 22 Jan 2013 15:25:35 +0000 (17:25 +0200)]
fix tests
Valeriy Sizov [Tue, 22 Jan 2013 15:15:22 +0000 (17:15 +0200)]
remove length of issue content
according to #2677
Valeriy Sizov [Tue, 22 Jan 2013 15:10:00 +0000 (17:10 +0200)]
remove length of snippet content
Riyad Preukschas [Tue, 22 Jan 2013 12:36:18 +0000 (04:36 -0800)]
Merge pull request #2684 from rk4an/patch-1
Fix typo in gitlab.yml.example
Erkan [Tue, 22 Jan 2013 09:04:02 +0000 (10:04 +0100)]
Update config/gitlab.yml.example
Dmitriy Zaporozhets [Tue, 22 Jan 2013 08:35:58 +0000 (10:35 +0200)]
Use subproccess instead subshell for git calls
Dmitriy Zaporozhets [Mon, 21 Jan 2013 14:36:55 +0000 (16:36 +0200)]
done with 4.1. Version to 4.2.0pre :)
Dmitriy Zaporozhets [Mon, 21 Jan 2013 13:05:18 +0000 (15:05 +0200)]
Add warning if user own projet but not in team. Also show loading when merge MR
Dmitriy Zaporozhets [Mon, 21 Jan 2013 12:16:48 +0000 (14:16 +0200)]
Reporter cant create MR. Show user authorized projects in Admin area
Dmitriy Zaporozhets [Mon, 21 Jan 2013 10:23:23 +0000 (02:23 -0800)]
Merge pull request #2673 from AlexDenisov/submodule_rendering_bug
Render submodule bugfix
Alex Denisov [Mon, 21 Jan 2013 09:48:25 +0000 (09:48 +0000)]
Render empty string instead of nil
Dmitriy Zaporozhets [Mon, 21 Jan 2013 07:06:25 +0000 (09:06 +0200)]
gitlab 4.1rc
Dmitriy Zaporozhets [Sun, 20 Jan 2013 12:17:56 +0000 (14:17 +0200)]
Fix application crash on help page
Riyad Preukschas [Sat, 19 Jan 2013 14:23:05 +0000 (15:23 +0100)]
Update text on help#public_access page
Riyad Preukschas [Sat, 19 Jan 2013 14:22:41 +0000 (15:22 +0100)]
Fix public/projects#index page
Riyad Preukschas [Sat, 19 Jan 2013 00:47:57 +0000 (01:47 +0100)]
Small fixes
Riyad Preukschas [Sat, 19 Jan 2013 00:35:16 +0000 (01:35 +0100)]
Redo help#help_pages partial
Riyad Preukschas [Sat, 19 Jan 2013 00:34:11 +0000 (01:34 +0100)]
Reorder help routes
Riyad Preukschas [Sat, 19 Jan 2013 00:33:27 +0000 (01:33 +0100)]
Fix public layout
Riyad Preukschas [Sat, 19 Jan 2013 00:32:38 +0000 (01:32 +0100)]
Rename help#public_area to help#public_access
Riyad Preukschas [Sat, 19 Jan 2013 00:30:05 +0000 (01:30 +0100)]
Fix public cloning option text on projects#edit page
Riyad Preukschas [Fri, 18 Jan 2013 19:02:48 +0000 (20:02 +0100)]
Fix text on groups#show page
Riyad Preukschas [Sat, 19 Jan 2013 13:52:25 +0000 (14:52 +0100)]
Fix common mixup when instlling gems from the installation guide
Dmitriy Zaporozhets [Sat, 19 Jan 2013 11:57:50 +0000 (13:57 +0200)]
Uncomment forgotten code
Dmitriy Zaporozhets [Sat, 19 Jan 2013 11:56:55 +0000 (13:56 +0200)]
Remove chdir inside runtime. Improved gitolite shell commands
Dmitriy Zaporozhets [Sat, 19 Jan 2013 10:50:44 +0000 (12:50 +0200)]
Remove link to non-existing page. Fixes #2620
Dmitriy Zaporozhets [Sat, 19 Jan 2013 10:09:23 +0000 (12:09 +0200)]
Increase Issue description size to 10k. Fixes #2545
Dmitriy Zaporozhets [Sat, 19 Jan 2013 09:58:36 +0000 (11:58 +0200)]
raise exception if gitolite is broken
Dmitriy Zaporozhets [Sat, 19 Jan 2013 09:11:25 +0000 (11:11 +0200)]
Fixed developer push to protected branch. Closes #2647
Dmitriy Zaporozhets [Fri, 18 Jan 2013 20:23:11 +0000 (22:23 +0200)]
Fix project creation
Dmitriy Zaporozhets [Fri, 18 Jan 2013 18:21:13 +0000 (20:21 +0200)]
Improve CreateContext call. Fixed test
GitLab [Thu, 17 Jan 2013 15:35:57 +0000 (17:35 +0200)]
Refactor project creation. Added logout link to profile page
Dmitriy Zaporozhets [Fri, 18 Jan 2013 13:18:06 +0000 (05:18 -0800)]
Merge pull request #2050 from dosire/allow_self_signup
Add optional signup
Marin Jankovski [Tue, 6 Nov 2012 13:30:48 +0000 (14:30 +0100)]
Add optional signup.
Riyad Preukschas [Fri, 18 Jan 2013 02:57:49 +0000 (18:57 -0800)]
Merge pull request #2653 from jouve/fix_default_settings
Fix default settings when they are boolean.
Cyril [Thu, 10 Jan 2013 01:09:46 +0000 (02:09 +0100)]
Fix default settings when they are boolean.
error is that ```enabled ||= true``` always evaluates to true.
Change all initialization of bool settings to use the same syntax:
```setting = true if setting.nil?```
Dmitriy Zaporozhets [Thu, 17 Jan 2013 20:53:40 +0000 (22:53 +0200)]
Improve link to comment targets on dashboard
Dmitriy Zaporozhets [Thu, 17 Jan 2013 20:40:56 +0000 (12:40 -0800)]
Merge pull request #2650 from riyad/setup-task-warning
Improve setup task, by making it less dangerous
Dmitriy Zaporozhets [Thu, 17 Jan 2013 20:38:58 +0000 (12:38 -0800)]
Merge pull request #2649 from tjeezy/patch-1
Eliminate horizontal shifting on diff body heights
Dmitriy Zaporozhets [Thu, 17 Jan 2013 20:35:45 +0000 (22:35 +0200)]
switch to use link_to_member to prevent 500 if user is a project owner but does not have membership and leave comment
Riyad Preukschas [Thu, 17 Jan 2013 20:26:22 +0000 (21:26 +0100)]
Rename gitlab:app:setup task to gitlab:setup
Riyad Preukschas [Thu, 17 Jan 2013 20:20:18 +0000 (21:20 +0100)]
Remove the setup task from the maintenance docs
Riyad Preukschas [Thu, 17 Jan 2013 20:19:36 +0000 (21:19 +0100)]
Add a warning prompt to the setup task
TJ Koblentz [Thu, 17 Jan 2013 19:35:35 +0000 (11:35 -0800)]
Eliminate horizontal shifting on diff body heights
Riyad Preukschas [Thu, 17 Jan 2013 18:58:29 +0000 (19:58 +0100)]
Update custom SSH connection section in installation guide
Riyad Preukschas [Thu, 17 Jan 2013 18:47:17 +0000 (10:47 -0800)]
Merge pull request #2632 from yin8086/SSHPort
Add SSH custom port support for install/installation.md
Dmitriy Zaporozhets [Thu, 17 Jan 2013 13:58:40 +0000 (15:58 +0200)]
Updated CHANGELOG
Riyad Preukschas [Thu, 17 Jan 2013 12:19:40 +0000 (13:19 +0100)]
Update doc/install/structure.md
Dmitriy Zaporozhets [Thu, 17 Jan 2013 11:11:53 +0000 (13:11 +0200)]
Fix assign-to-me filter for project issues
GitLab [Thu, 17 Jan 2013 10:21:52 +0000 (12:21 +0200)]
Remove satellites when moving namespace
Dmitriy Zaporozhets [Thu, 17 Jan 2013 10:07:01 +0000 (12:07 +0200)]
Fix branch remove on automerge
Dmitriy Zaporozhets [Thu, 17 Jan 2013 09:57:47 +0000 (11:57 +0200)]
Better solution for strict key check
Stardrad Yin [Thu, 17 Jan 2013 07:11:00 +0000 (15:11 +0800)]
Add SSH custom port support for install/installation.md
Riyad Preukschas [Thu, 17 Jan 2013 01:00:09 +0000 (02:00 +0100)]
Fix GFM specs
Riyad Preukschas [Wed, 16 Jan 2013 23:58:53 +0000 (15:58 -0800)]
Merge pull request #2346 from sodabrew/omniauth_configs
Allow the OmniAuth provider args parameter to be passed through
Riyad Preukschas [Wed, 16 Jan 2013 23:43:35 +0000 (00:43 +0100)]
Fix gitolite config checks for old Gitolite versions
Fixes #2608
Riyad Preukschas [Wed, 16 Jan 2013 23:09:08 +0000 (00:09 +0100)]
Fix check.rake to use the new user and group settings
Riyad Preukschas [Wed, 16 Jan 2013 22:54:48 +0000 (23:54 +0100)]
Fix settings
Riyad Preukschas [Wed, 16 Jan 2013 22:20:47 +0000 (23:20 +0100)]
Merge branch 'check_gitlab_in_git_group' of https://github.com/VonC/gitlabhq into VonC-check_gitlab_in_git_group
Riyad Preukschas [Wed, 16 Jan 2013 22:03:21 +0000 (23:03 +0100)]
Fix markdown for note events
Riyad Preukschas [Wed, 16 Jan 2013 21:37:39 +0000 (22:37 +0100)]
Fix parsing of ref-like Urls in links and images in GFM
Fixes #2166
Riyad Preukschas [Wed, 16 Jan 2013 21:39:45 +0000 (22:39 +0100)]
Use image Urls for Emoji in GFM
Fixes #2617
Riyad Preukschas [Wed, 16 Jan 2013 21:08:01 +0000 (22:08 +0100)]
Use Urls for references in GFM
Riyad Preukschas [Wed, 16 Jan 2013 17:08:51 +0000 (18:08 +0100)]
Fix GFM in events
Fixes #2563
Riyad Preukschas [Wed, 16 Jan 2013 16:31:11 +0000 (17:31 +0100)]
Fix #2576
Riyad Preukschas [Wed, 16 Jan 2013 16:00:38 +0000 (17:00 +0100)]
Fix satellite path settings
Dmitriy Zaporozhets [Wed, 16 Jan 2013 15:42:46 +0000 (07:42 -0800)]
Merge pull request #2621 from jouve/default_setting
add default for Settings['satellites']
Cyril [Wed, 16 Jan 2013 15:11:40 +0000 (16:11 +0100)]
add default for Settings['satellites']
Dmitriy Zaporozhets [Wed, 16 Jan 2013 14:54:01 +0000 (16:54 +0200)]
Owner can enable public mode for project
Dmitriy Zaporozhets [Wed, 16 Jan 2013 14:17:21 +0000 (16:17 +0200)]
added sctructure.md
Dmitriy Zaporozhets [Wed, 16 Jan 2013 13:20:24 +0000 (05:20 -0800)]
Merge pull request #2420 from koenpunt/patch-1
Remove wget dependency, now all curl
Dmitriy Zaporozhets [Wed, 16 Jan 2013 13:05:45 +0000 (05:05 -0800)]
Merge pull request #2460 from calmh/expose-namespace
'namespace' should be exposed via the API
Dmitriy Zaporozhets [Wed, 16 Jan 2013 12:59:29 +0000 (04:59 -0800)]
Merge pull request #2538 from jouve/app_helper
clean application_helper a bit
Dmitriy Zaporozhets [Wed, 16 Jan 2013 12:55:52 +0000 (04:55 -0800)]
Merge pull request #1586 from Bregor/ber_to_string
Auth: Net::BER::BerIdentifiedStrings to Strings
Dmitriy Zaporozhets [Wed, 16 Jan 2013 11:30:31 +0000 (13:30 +0200)]
Store repo satellites outside of tmp directory
Dmitriy Zaporozhets [Tue, 15 Jan 2013 20:54:03 +0000 (22:54 +0200)]
change roadmap
Dmitriy Zaporozhets [Tue, 15 Jan 2013 17:18:52 +0000 (19:18 +0200)]
should be green build now :)
Dmitriy Zaporozhets [Tue, 15 Jan 2013 16:20:58 +0000 (18:20 +0200)]
Fix spec/requests/notes_on_merge_requests_spec.r
Dmitriy Zaporozhets [Tue, 15 Jan 2013 15:12:53 +0000 (17:12 +0200)]
Fixed spinach test
Dmitriy Zaporozhets [Tue, 15 Jan 2013 14:36:35 +0000 (16:36 +0200)]
more tests fixed
Dmitriy Zaporozhets [Tue, 15 Jan 2013 13:19:14 +0000 (15:19 +0200)]
Fix notes model specs
Dmitriy Zaporozhets [Tue, 15 Jan 2013 13:04:22 +0000 (15:04 +0200)]
fix notes_on_wall specs
Dmitriy Zaporozhets [Tue, 15 Jan 2013 12:28:04 +0000 (14:28 +0200)]
More fixes for test
Dmitriy Zaporozhets [Tue, 15 Jan 2013 11:37:20 +0000 (13:37 +0200)]
Fix few test and notify for commit author
Dmitriy Zaporozhets [Tue, 15 Jan 2013 10:43:09 +0000 (12:43 +0200)]
Merge branch 'riyad-discussions'
Dmitriy Zaporozhets [Tue, 15 Jan 2013 10:42:54 +0000 (12:42 +0200)]
fixing some test
Dmitriy Zaporozhets [Tue, 15 Jan 2013 09:12:17 +0000 (11:12 +0200)]
change logic on line_code
Riyad Preukschas [Mon, 14 Jan 2013 23:53:00 +0000 (00:53 +0100)]
Merge branch 'master' into discussions
Riyad Preukschas [Mon, 14 Jan 2013 23:11:35 +0000 (00:11 +0100)]
Replace commit diff note request specs with spinach features
Riyad Preukschas [Mon, 14 Jan 2013 22:55:02 +0000 (23:55 +0100)]
Replace commit note request specs with spinach features
Riyad Preukschas [Mon, 14 Jan 2013 23:52:25 +0000 (00:52 +0100)]
Merge commit 'master' into discussions
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb