OSDN Git Service

wvm/gitlab.git
11 years agoRefactor project creation. Added logout link to profile page
GitLab [Thu, 17 Jan 2013 15:35:57 +0000 (17:35 +0200)]
Refactor project creation. Added logout link to profile page

11 years agoMerge pull request #2050 from dosire/allow_self_signup
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

11 years agoAdd optional signup.
Marin Jankovski [Tue, 6 Nov 2012 13:30:48 +0000 (14:30 +0100)]
Add optional signup.

11 years agoMerge pull request #2653 from jouve/fix_default_settings
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.

11 years agoFix 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?```

11 years agoImprove link to comment targets on dashboard
Dmitriy Zaporozhets [Thu, 17 Jan 2013 20:53:40 +0000 (22:53 +0200)]
Improve link to comment targets on dashboard

11 years agoMerge pull request #2650 from riyad/setup-task-warning
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

11 years agoMerge pull request #2649 from tjeezy/patch-1
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

11 years agoswitch to use link_to_member to prevent 500 if user is a project owner but does not...
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

11 years agoRename gitlab:app:setup task to gitlab:setup
Riyad Preukschas [Thu, 17 Jan 2013 20:26:22 +0000 (21:26 +0100)]
Rename gitlab:app:setup task to gitlab:setup

11 years agoRemove the setup task from the maintenance docs
Riyad Preukschas [Thu, 17 Jan 2013 20:20:18 +0000 (21:20 +0100)]
Remove the setup task from the maintenance docs

11 years agoAdd a warning prompt to the setup task
Riyad Preukschas [Thu, 17 Jan 2013 20:19:36 +0000 (21:19 +0100)]
Add a warning prompt to the setup task

11 years agoEliminate horizontal shifting on diff body heights
TJ Koblentz [Thu, 17 Jan 2013 19:35:35 +0000 (11:35 -0800)]
Eliminate horizontal shifting on diff body heights

11 years agoUpdate custom SSH connection section in installation guide
Riyad Preukschas [Thu, 17 Jan 2013 18:58:29 +0000 (19:58 +0100)]
Update custom SSH connection section in installation guide

11 years agoMerge pull request #2632 from yin8086/SSHPort
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

11 years agoUpdated CHANGELOG
Dmitriy Zaporozhets [Thu, 17 Jan 2013 13:58:40 +0000 (15:58 +0200)]
Updated CHANGELOG

11 years agoUpdate doc/install/structure.md
Riyad Preukschas [Thu, 17 Jan 2013 12:19:40 +0000 (13:19 +0100)]
Update doc/install/structure.md

11 years agoFix assign-to-me filter for project issues
Dmitriy Zaporozhets [Thu, 17 Jan 2013 11:11:53 +0000 (13:11 +0200)]
Fix assign-to-me filter for project issues

11 years agoRemove satellites when moving namespace
GitLab [Thu, 17 Jan 2013 10:21:52 +0000 (12:21 +0200)]
Remove satellites when moving namespace

11 years agoFix branch remove on automerge
Dmitriy Zaporozhets [Thu, 17 Jan 2013 10:07:01 +0000 (12:07 +0200)]
Fix branch remove on automerge

11 years agoBetter solution for strict key check
Dmitriy Zaporozhets [Thu, 17 Jan 2013 09:57:47 +0000 (11:57 +0200)]
Better solution for strict key check

11 years agoAdd SSH custom port support for install/installation.md
Stardrad Yin [Thu, 17 Jan 2013 07:11:00 +0000 (15:11 +0800)]
Add SSH custom port support for install/installation.md

11 years agoFix GFM specs
Riyad Preukschas [Thu, 17 Jan 2013 01:00:09 +0000 (02:00 +0100)]
Fix GFM specs

11 years agoMerge pull request #2346 from sodabrew/omniauth_configs
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

11 years agoFix gitolite config checks for old Gitolite versions
Riyad Preukschas [Wed, 16 Jan 2013 23:43:35 +0000 (00:43 +0100)]
Fix gitolite config checks for old Gitolite versions

Fixes #2608

11 years agoFix check.rake to use the new user and group settings
Riyad Preukschas [Wed, 16 Jan 2013 23:09:08 +0000 (00:09 +0100)]
Fix check.rake to use the new user and group settings

11 years agoFix settings
Riyad Preukschas [Wed, 16 Jan 2013 22:54:48 +0000 (23:54 +0100)]
Fix settings

11 years agoMerge branch 'check_gitlab_in_git_group' of https://github.com/VonC/gitlabhq into...
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

11 years agoFix markdown for note events
Riyad Preukschas [Wed, 16 Jan 2013 22:03:21 +0000 (23:03 +0100)]
Fix markdown for note events

11 years agoFix parsing of ref-like Urls in links and images in GFM
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

11 years agoUse image Urls for Emoji in GFM
Riyad Preukschas [Wed, 16 Jan 2013 21:39:45 +0000 (22:39 +0100)]
Use image Urls for Emoji in GFM

Fixes #2617

11 years agoUse Urls for references in GFM
Riyad Preukschas [Wed, 16 Jan 2013 21:08:01 +0000 (22:08 +0100)]
Use Urls for references in GFM

11 years agoFix GFM in events
Riyad Preukschas [Wed, 16 Jan 2013 17:08:51 +0000 (18:08 +0100)]
Fix GFM in events

Fixes #2563

11 years agoFix #2576
Riyad Preukschas [Wed, 16 Jan 2013 16:31:11 +0000 (17:31 +0100)]
Fix #2576

11 years agoFix satellite path settings
Riyad Preukschas [Wed, 16 Jan 2013 16:00:38 +0000 (17:00 +0100)]
Fix satellite path settings

11 years agoMerge pull request #2621 from jouve/default_setting
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']

11 years agoadd default for Settings['satellites']
Cyril [Wed, 16 Jan 2013 15:11:40 +0000 (16:11 +0100)]
add default for Settings['satellites']

11 years agoOwner can enable public mode for project
Dmitriy Zaporozhets [Wed, 16 Jan 2013 14:54:01 +0000 (16:54 +0200)]
Owner can enable public mode for project

11 years agoadded sctructure.md
Dmitriy Zaporozhets [Wed, 16 Jan 2013 14:17:21 +0000 (16:17 +0200)]
added sctructure.md

11 years agoMerge pull request #2420 from koenpunt/patch-1
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

11 years agoMerge pull request #2460 from calmh/expose-namespace
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

11 years agoMerge pull request #2538 from jouve/app_helper
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

11 years agoMerge pull request #1586 from Bregor/ber_to_string
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

11 years agoStore repo satellites outside of tmp directory
Dmitriy Zaporozhets [Wed, 16 Jan 2013 11:30:31 +0000 (13:30 +0200)]
Store repo satellites outside of tmp directory

11 years agochange roadmap
Dmitriy Zaporozhets [Tue, 15 Jan 2013 20:54:03 +0000 (22:54 +0200)]
change roadmap

11 years agoshould be green build now :)
Dmitriy Zaporozhets [Tue, 15 Jan 2013 17:18:52 +0000 (19:18 +0200)]
should be green build now :)

11 years agoFix spec/requests/notes_on_merge_requests_spec.r
Dmitriy Zaporozhets [Tue, 15 Jan 2013 16:20:58 +0000 (18:20 +0200)]
Fix spec/requests/notes_on_merge_requests_spec.r

11 years agoFixed spinach test
Dmitriy Zaporozhets [Tue, 15 Jan 2013 15:12:53 +0000 (17:12 +0200)]
Fixed spinach test

11 years agomore tests fixed
Dmitriy Zaporozhets [Tue, 15 Jan 2013 14:36:35 +0000 (16:36 +0200)]
more tests fixed

11 years agoFix notes model specs
Dmitriy Zaporozhets [Tue, 15 Jan 2013 13:19:14 +0000 (15:19 +0200)]
Fix notes model specs

11 years agofix notes_on_wall specs
Dmitriy Zaporozhets [Tue, 15 Jan 2013 13:04:22 +0000 (15:04 +0200)]
fix notes_on_wall specs

11 years agoMore fixes for test
Dmitriy Zaporozhets [Tue, 15 Jan 2013 12:28:04 +0000 (14:28 +0200)]
More fixes for test

11 years agoFix few test and notify for commit author
Dmitriy Zaporozhets [Tue, 15 Jan 2013 11:37:20 +0000 (13:37 +0200)]
Fix few test and notify for commit author

11 years agoMerge branch 'riyad-discussions'
Dmitriy Zaporozhets [Tue, 15 Jan 2013 10:43:09 +0000 (12:43 +0200)]
Merge branch 'riyad-discussions'

11 years agofixing some test
Dmitriy Zaporozhets [Tue, 15 Jan 2013 10:42:54 +0000 (12:42 +0200)]
fixing some test

11 years agochange logic on line_code
Dmitriy Zaporozhets [Tue, 15 Jan 2013 09:12:17 +0000 (11:12 +0200)]
change logic on line_code

11 years agoMerge branch 'master' into discussions
Riyad Preukschas [Mon, 14 Jan 2013 23:53:00 +0000 (00:53 +0100)]
Merge branch 'master' into discussions

11 years agoReplace commit diff note request specs with spinach features
Riyad Preukschas [Mon, 14 Jan 2013 23:11:35 +0000 (00:11 +0100)]
Replace commit diff note request specs with spinach features

11 years agoReplace commit 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

11 years agoMerge commit 'master' into discussions
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

11 years agoAdd preliminary specs for notes on merge requests
Riyad Preukschas [Mon, 14 Jan 2013 23:27:59 +0000 (00:27 +0100)]
Add preliminary specs for notes on merge requests

11 years agoSmaller fixes
Riyad Preukschas [Mon, 14 Jan 2013 23:27:26 +0000 (00:27 +0100)]
Smaller fixes

11 years agoMerge pull request #2585 from timl/patch-1
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.

11 years agoline numbers for blame
Dmitriy Zaporozhets [Mon, 14 Jan 2013 18:55:57 +0000 (20:55 +0200)]
line numbers for blame

11 years agoremove thin from production env. Use unicorn for foreman
Dmitriy Zaporozhets [Mon, 14 Jan 2013 18:21:04 +0000 (20:21 +0200)]
remove thin from production env. Use unicorn for foreman

11 years agoMerge pull request #2584 from jasl8r/public-grack-clone
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

11 years agoUpdate doc/install/installation.md
Tim Laszlo [Mon, 14 Jan 2013 15:28:33 +0000 (09:28 -0600)]
Update doc/install/installation.md

Change "th" to "the"

11 years agoPublic HTTP clones and remove auth request for public projects
Jeremy Slater [Mon, 14 Jan 2013 14:46:55 +0000 (09:46 -0500)]
Public HTTP clones and remove auth request for public projects

11 years agoFix git group detection for gitolite ssh user.
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

11 years agoCHANGELOG for 4.1
Dmitriy Zaporozhets [Mon, 14 Jan 2013 11:39:09 +0000 (13:39 +0200)]
CHANGELOG for 4.1

11 years agoDont set @project variable in list. Remove a bit of duplication in dash and group
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

11 years agoprofjects filter with_push to project model
Dmitriy Zaporozhets [Mon, 14 Jan 2013 07:44:27 +0000 (09:44 +0200)]
profjects filter with_push to project model

11 years agoFew more filters for admin / projects
Dmitriy Zaporozhets [Mon, 14 Jan 2013 07:37:29 +0000 (09:37 +0200)]
Few more filters for admin / projects

11 years agoAdd public filter to admin projects
Dmitriy Zaporozhets [Sun, 13 Jan 2013 15:24:29 +0000 (17:24 +0200)]
Add public filter to admin projects

11 years agofix unauth for public
Dmitriy Zaporozhets [Sat, 12 Jan 2013 19:54:52 +0000 (21:54 +0200)]
fix unauth for public

11 years agoPublic git read-only access via http
Dmitriy Zaporozhets [Thu, 10 Jan 2013 18:17:57 +0000 (20:17 +0200)]
Public git read-only access via http

11 years agoReplace all stat command line calls with ruby equivalents
Riyad Preukschas [Fri, 11 Jan 2013 23:44:40 +0000 (00:44 +0100)]
Replace all stat command line calls with ruby equivalents

11 years agoMake method names clearer in check.rake
Riyad Preukschas [Fri, 11 Jan 2013 21:25:18 +0000 (22:25 +0100)]
Make method names clearer in check.rake

11 years agoMove OS detection to task helpers and add detection of OS X
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

11 years agoUpdate empty error messages and warn if not viewing the most recent wiki page
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

11 years agoUpdate wiki pages
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

11 years agoFix link_to_member to not be bold by default
Riyad Preukschas [Fri, 11 Jan 2013 19:16:37 +0000 (20:16 +0100)]
Fix link_to_member to not be bold by default

11 years agoAdd an ordering scope to Wiki
Riyad Preukschas [Fri, 11 Jan 2013 19:04:14 +0000 (20:04 +0100)]
Add an ordering scope to Wiki

11 years agoMove wiki delete button to the edit page
Riyad Preukschas [Fri, 11 Jan 2013 19:03:43 +0000 (20:03 +0100)]
Move wiki delete button to the edit page

11 years agoMerge pull request #2561 from MrHammy/master
Riyad Preukschas [Fri, 11 Jan 2013 18:20:23 +0000 (10:20 -0800)]
Merge pull request #2561 from MrHammy/master

Fix to pages links

11 years agoMove checks after init script installation in docs
Riyad Preukschas [Fri, 11 Jan 2013 17:58:13 +0000 (18:58 +0100)]
Move checks after init script installation in docs

11 years agoupdate grammar in check application status section
David Southard [Thu, 10 Jan 2013 19:21:54 +0000 (13:21 -0600)]
update grammar in check application status section

11 years agoUpdate app/views/wikis/pages.html.haml
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

11 years agoMerge pull request #2555 from studiofrenetic/master
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)

11 years agoFix 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)

11 years agoFix missing image for last push
Dmitriy Zaporozhets [Thu, 10 Jan 2013 18:20:56 +0000 (20:20 +0200)]
Fix missing image for last push

11 years agoMerge branch 'improve/wiki_typography' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:59:36 +0000 (16:59 +0000)]
Merge branch 'improve/wiki_typography' of dev.gitlabhq.com:gitlab/gitlabhq

11 years agoMerge branch 'bug/pager_load' 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

11 years agoMerge branch 'improve/filter_icons' 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

11 years agoMerge branch 'improve/admin' 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

11 years agoImprove wiki typography
Dmitriy Zaporozhets [Thu, 10 Jan 2013 16:09:12 +0000 (18:09 +0200)]
Improve wiki typography

11 years agoFix pager loading on every page in application
Dmitriy Zaporozhets [Thu, 10 Jan 2013 15:38:37 +0000 (17:38 +0200)]
Fix pager loading on every page in application

11 years agoRemove unused images. More use of font-awesome icons
Dmitriy Zaporozhets [Thu, 10 Jan 2013 06:43:25 +0000 (08:43 +0200)]
Remove unused images. More use of font-awesome icons

11 years agosidekiq.log in admin area. Improved admin dashboard
Dmitriy Zaporozhets [Thu, 10 Jan 2013 06:43:25 +0000 (08:43 +0200)]
sidekiq.log in admin area. Improved admin dashboard

11 years agoMerge pull request #2539 from jameswritescode/remove_passenger_fix
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