OSDN Git Service
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
Riyad Preukschas [Mon, 14 Jan 2013 23:27:59 +0000 (00:27 +0100)]
Add preliminary specs for notes on merge requests
Riyad Preukschas [Mon, 14 Jan 2013 23:27:26 +0000 (00:27 +0100)]
Smaller fixes
Riyad Preukschas [Mon, 14 Jan 2013 21:21:26 +0000 (13:21 -0800)]
Merge pull request #2585 from timl/patch-1
Fix typo in installation guide.
Dmitriy Zaporozhets [Mon, 14 Jan 2013 18:55:57 +0000 (20:55 +0200)]
line numbers for blame
Dmitriy Zaporozhets [Mon, 14 Jan 2013 18:21:04 +0000 (20:21 +0200)]
remove thin from production env. Use unicorn for foreman
Dmitriy Zaporozhets [Mon, 14 Jan 2013 18:13:02 +0000 (10:13 -0800)]
Merge pull request #2584 from jasl8r/public-grack-clone
Public HTTP clones and remove auth request for public projects
Tim Laszlo [Mon, 14 Jan 2013 15:28:33 +0000 (09:28 -0600)]
Update doc/install/installation.md
Change "th" to "the"
Jeremy Slater [Mon, 14 Jan 2013 14:46:55 +0000 (09:46 -0500)]
Public HTTP clones and remove auth request for public projects
VonC [Tue, 8 Jan 2013 15:17:53 +0000 (15:17 +0000)]
Fix git group detection for gitolite ssh user.
The tasks gitlab:env:info mixes user and group, and presume as a group 'git'.
However, gitolite group name can be anything.
That patch add the git group name in the config,
and check gitolite.ssh_user group against git.group
(which defaults to 'git', as before this patch, if undefined).
M config/gitlab.yml.example:
Add 'group' in 'git' section
Mention default value for the two extra settings
M lib/tasks/gitlab/check.rake:
Check that gitolite.ssh_user *group* is the one defined in git.group.
Make sure to default to 'git' as the expected group
if said group is undefined in the config.
Note: uses a more complete regexp for the group detection
(the group can start, end or be in the middle or the list of groups
of gitolite.ssh_user)
M: config/initializers/1_settings.rb:
Add default values for gitolite.group and gitlab.user
Dmitriy Zaporozhets [Mon, 14 Jan 2013 11:39:09 +0000 (13:39 +0200)]
CHANGELOG for 4.1
Dmitriy Zaporozhets [Mon, 14 Jan 2013 08:09:01 +0000 (10:09 +0200)]
Dont set @project variable in list. Remove a bit of duplication in dash and group
Dmitriy Zaporozhets [Mon, 14 Jan 2013 07:44:27 +0000 (09:44 +0200)]
profjects filter with_push to project model
Dmitriy Zaporozhets [Mon, 14 Jan 2013 07:37:29 +0000 (09:37 +0200)]
Few more filters for admin / projects
Dmitriy Zaporozhets [Sun, 13 Jan 2013 15:24:29 +0000 (17:24 +0200)]
Add public filter to admin projects
Dmitriy Zaporozhets [Sat, 12 Jan 2013 19:54:52 +0000 (21:54 +0200)]
fix unauth for public
Dmitriy Zaporozhets [Thu, 10 Jan 2013 18:17:57 +0000 (20:17 +0200)]
Public git read-only access via http
Riyad Preukschas [Fri, 11 Jan 2013 23:44:40 +0000 (00:44 +0100)]
Replace all stat command line calls with ruby equivalents
Riyad Preukschas [Fri, 11 Jan 2013 21:25:18 +0000 (22:25 +0100)]
Make method names clearer in check.rake
Riyad Preukschas [Sat, 12 Jan 2013 00:24:51 +0000 (01:24 +0100)]
Move OS detection to task helpers and add detection of OS X
Riyad Preukschas [Fri, 11 Jan 2013 20:04:21 +0000 (21:04 +0100)]
Update empty error messages and warn if not viewing the most recent wiki page
Riyad Preukschas [Fri, 11 Jan 2013 19:20:11 +0000 (20:20 +0100)]
Update wiki pages
* Properly name columns in Pages and History views
* Link to Authors
* Make views more consistent
Riyad Preukschas [Fri, 11 Jan 2013 19:16:37 +0000 (20:16 +0100)]
Fix link_to_member to not be bold by default
Riyad Preukschas [Fri, 11 Jan 2013 19:04:14 +0000 (20:04 +0100)]
Add an ordering scope to Wiki
Riyad Preukschas [Fri, 11 Jan 2013 19:03:43 +0000 (20:03 +0100)]
Move wiki delete button to the edit page
Riyad Preukschas [Fri, 11 Jan 2013 18:20:23 +0000 (10:20 -0800)]
Merge pull request #2561 from MrHammy/master
Fix to pages links
Riyad Preukschas [Fri, 11 Jan 2013 17:58:13 +0000 (18:58 +0100)]
Move checks after init script installation in docs
David Southard [Thu, 10 Jan 2013 19:21:54 +0000 (13:21 -0600)]
update grammar in check application status section
MrHammy [Fri, 11 Jan 2013 12:40:29 +0000 (13:40 +0100)]
Update app/views/wikis/pages.html.haml
Changed the link in the pages of the wiki to the direct link instead of the first created page
Dmitriy Zaporozhets [Thu, 10 Jan 2013 21:02:15 +0000 (13:02 -0800)]
Merge pull request #2555 from studiofrenetic/master
Fix for archive download (method path missing)
Martin Bastien [Thu, 10 Jan 2013 20:55:34 +0000 (15:55 -0500)]
Fix for archive download (method path missing)
Dmitriy Zaporozhets [Thu, 10 Jan 2013 18:20:56 +0000 (20:20 +0200)]
Fix missing image for last push
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:59:36 +0000 (16:59 +0000)]
Merge branch 'improve/wiki_typography' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:59:27 +0000 (16:59 +0000)]
Merge branch 'bug/pager_load' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:59:12 +0000 (16:59 +0000)]
Merge branch 'improve/filter_icons' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:59:01 +0000 (16:59 +0000)]
Merge branch 'improve/admin' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:09:12 +0000 (18:09 +0200)]
Improve wiki typography
Dmitriy Zaporozhets [Thu, 10 Jan 2013 15:38:37 +0000 (17:38 +0200)]
Fix pager loading on every page in application
Dmitriy Zaporozhets [Thu, 10 Jan 2013 06:43:25 +0000 (08:43 +0200)]
Remove unused images. More use of font-awesome icons
Dmitriy Zaporozhets [Thu, 10 Jan 2013 06:43:25 +0000 (08:43 +0200)]
sidekiq.log in admin area. Improved admin dashboard
Dmitriy Zaporozhets [Thu, 10 Jan 2013 06:35:10 +0000 (22:35 -0800)]
Merge pull request #2539 from jameswritescode/remove_passenger_fix
remove passenger_fix
James Newton [Thu, 10 Jan 2013 04:17:03 +0000 (22:17 -0600)]
remove passenger_fix.rb, which due to the recent removal of Resque in favor of sidekiq breaks gitlab in passenger
Cyril [Thu, 10 Jan 2013 00:46:23 +0000 (01:46 +0100)]
clean app helper
* remove unused method
* simplify gravatar_icon
Riyad Preukschas [Wed, 9 Jan 2013 23:08:15 +0000 (00:08 +0100)]
Fix sidekiq check task
Riyad Preukschas [Wed, 9 Jan 2013 22:56:47 +0000 (23:56 +0100)]
Fix sidekiq task to use Rails
Dmitriy Zaporozhets [Wed, 9 Jan 2013 22:33:18 +0000 (14:33 -0800)]
Merge pull request #2533 from gliptak/master
Use ruby 1.9.3-p327 on travis-ci
Dmitriy Zaporozhets [Wed, 9 Jan 2013 21:26:54 +0000 (13:26 -0800)]
Merge pull request #2534 from AlexDenisov/ajax_activities
Reload activities/events on the dashboard page via ajax
Alex Denisov [Wed, 9 Jan 2013 21:02:41 +0000 (21:02 +0000)]
replace javascript:void with preventDefault
gliptak [Wed, 9 Jan 2013 19:43:49 +0000 (14:43 -0500)]
Use ruby 1.9.3-p327 on travis-ci
Alex Denisov [Wed, 9 Jan 2013 19:28:31 +0000 (19:28 +0000)]
dashboard js -> coffee
Alex Denisov [Wed, 9 Jan 2013 18:14:24 +0000 (18:14 +0000)]
Reloading of events via ajax instead of page reloading.
AlexDenisov [Wed, 9 Jan 2013 05:58:27 +0000 (05:58 +0000)]
JavaScript removed from dashboard#index template.
Alex Denisov [Mon, 3 Dec 2012 05:09:05 +0000 (07:09 +0200)]
Typo fixed
Alex Denisov [Mon, 3 Dec 2012 00:29:07 +0000 (02:29 +0200)]
Event filters stores at cookies.
Alex Denisov [Sun, 2 Dec 2012 20:54:19 +0000 (22:54 +0200)]
Tests on events filtering added