OSDN Git Service

wvm/gitlab.git
12 years agoFixed grammar in 'please wait' message after creating project
Rob Taylor [Wed, 1 Aug 2012 10:19:20 +0000 (11:19 +0100)]
Fixed grammar in 'please wait' message after creating project

12 years agoUpdated merge request subheading.
Rob Taylor [Tue, 24 Jul 2012 10:22:13 +0000 (11:22 +0100)]
Updated merge request subheading.

Changed "authored or assigned to you" to read "authored by or assigned to you" which reads better.

12 years agoUp to 2.7.0 v2.7.0
randx [Sat, 21 Jul 2012 07:53:55 +0000 (10:53 +0300)]
Up to 2.7.0

12 years agoHelp section for system hooks completed
randx [Sat, 21 Jul 2012 07:47:57 +0000 (10:47 +0300)]
Help section for system hooks completed

12 years agoFix system hook example
randx [Sat, 21 Jul 2012 07:32:42 +0000 (10:32 +0300)]
Fix system hook example

12 years agomove SSH keys tab closer to begining
randx [Sat, 21 Jul 2012 07:27:09 +0000 (10:27 +0300)]
move SSH keys tab closer to begining

12 years agoEndless event loading for dsahboard
randx [Sat, 21 Jul 2012 07:23:05 +0000 (10:23 +0300)]
Endless event loading for dsahboard

12 years agoMerge pull request #1117 from patthoyts/pt/user-form
Dmitriy Zaporozhets [Fri, 20 Jul 2012 21:23:49 +0000 (14:23 -0700)]
Merge pull request #1117 from patthoyts/pt/user-form

Fix english on the edit user form.

12 years agoFix english on the edit user form.
Pat Thoyts [Tue, 17 Jul 2012 23:11:51 +0000 (00:11 +0100)]
Fix english on the edit user form.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
12 years agoMerge branch 'refactoring_controllers' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Fri, 20 Jul 2012 14:24:56 +0000 (14:24 +0000)]
Merge branch 'refactoring_controllers' of dev.gitlabhq.com:gitlabhq

12 years agoBox shadow for boxes
Dmitriy Zaporozhets [Fri, 20 Jul 2012 05:39:34 +0000 (08:39 +0300)]
Box shadow for boxes

12 years agoMerge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Fri, 20 Jul 2012 09:08:16 +0000 (09:08 +0000)]
Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq

12 years agoEnable observe for system hooks
Dmitriy Zaporozhets [Fri, 20 Jul 2012 09:08:59 +0000 (12:08 +0300)]
Enable observe for system hooks

12 years agoBaseContext
Dmitriy Zaporozhets [Fri, 20 Jul 2012 05:39:34 +0000 (08:39 +0300)]
BaseContext
Controllers refactoring with contexts
Move commit compare logic to model

12 years agoSystem Hooks: move callback to observer
Valeriy Sizov [Thu, 19 Jul 2012 22:01:29 +0000 (01:01 +0300)]
System Hooks: move callback to observer

12 years agoFix comments in MR. Fixed event destroy with user
Dmitriy Zaporozhets [Thu, 19 Jul 2012 04:05:57 +0000 (07:05 +0300)]
Fix comments in MR. Fixed event destroy with user

12 years agoIgnore backups dir
Dmitriy Zaporozhets [Thu, 19 Jul 2012 09:52:28 +0000 (12:52 +0300)]
Ignore backups dir

12 years agoMerge pull request #1106 from mrichardson-shelter/backup-create-fix-mysql-syntax...
Dmitriy Zaporozhets [Thu, 19 Jul 2012 09:46:14 +0000 (02:46 -0700)]
Merge pull request #1106 from mrichardson-shelter/backup-create-fix-mysql-syntax-error

Fixing MySQL syntax error

12 years agoSystem Hooks: rspec
Valeriy Sizov [Wed, 18 Jul 2012 21:24:37 +0000 (00:24 +0300)]
System Hooks: rspec

12 years agoSystem hooks: fix broken tests
Valeriy Sizov [Sun, 15 Jul 2012 14:36:06 +0000 (17:36 +0300)]
System hooks: fix broken tests

12 years agoSystem Hook: implemented
Valeriy Sizov [Sun, 15 Jul 2012 12:29:06 +0000 (15:29 +0300)]
System Hook: implemented

12 years agoSystem Hooks: CRUD has done
Valeriy Sizov [Thu, 12 Jul 2012 19:10:34 +0000 (22:10 +0300)]
System Hooks: CRUD has done

12 years agoRefactoring of hook functionality & bootsrap system hooks
Valeriy Sizov [Thu, 12 Jul 2012 12:36:33 +0000 (15:36 +0300)]
Refactoring of hook functionality & bootsrap system hooks

12 years agoMerge pull request #1096 from moregeek/show-flash-note-when-destroying-a-project v2.7.0pre
Valeriy Sizov [Wed, 18 Jul 2012 12:35:42 +0000 (05:35 -0700)]
Merge pull request #1096 from moregeek/show-flash-note-when-destroying-a-project

show flash notice after deletion of a project

12 years agoMerge pull request #1100 from patthoyts/pt/ldap-no-email
Valeriy Sizov [Wed, 18 Jul 2012 12:17:14 +0000 (05:17 -0700)]
Merge pull request #1100 from patthoyts/pt/ldap-no-email

Improve handling of misconfigured LDAP accounts.

12 years agoFixing MySQL syntax error
Michael Richardson [Wed, 18 Jul 2012 10:59:32 +0000 (11:59 +0100)]
Fixing MySQL syntax error

12 years agoCHANGELOG updated. Fixed MR bug. Logger improved
Dmitriy Zaporozhets [Tue, 17 Jul 2012 05:23:16 +0000 (08:23 +0300)]
CHANGELOG updated. Fixed MR bug. Logger improved

12 years agoColored labels for events on dashboard
Dmitriy Zaporozhets [Tue, 17 Jul 2012 05:21:16 +0000 (08:21 +0300)]
Colored labels for events on dashboard

12 years agoFeature: Unassigned Merge Requests
Dmitriy Zaporozhets [Tue, 17 Jul 2012 05:19:16 +0000 (08:19 +0300)]
Feature: Unassigned Merge Requests

12 years agoMR index pollished
Dmitriy Zaporozhets [Tue, 17 Jul 2012 05:17:16 +0000 (08:17 +0300)]
MR index pollished

12 years agoImprove handling of misconfigured LDAP accounts.
Pat Thoyts [Mon, 16 Jul 2012 22:31:28 +0000 (23:31 +0100)]
Improve handling of misconfigured LDAP accounts.

Gitlab requires an email address for all user accounts as this is the
default account id and is used for sending notifications. LDAP accounts
may be missing email fields so handle this by showing a sensible error
message before redirecting to the login screen again.

Resolves github issue #899

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
12 years agoshow flash notice after deletion of a project
moregeek [Mon, 16 Jul 2012 12:01:32 +0000 (14:01 +0200)]
show flash notice after deletion of a project

12 years agoAdmin logs improved. Commits list box styled
Dmitriy Zaporozhets [Mon, 16 Jul 2012 05:03:10 +0000 (08:03 +0300)]
Admin logs improved. Commits list box styled

12 years agoMerge pull request #1045 from tobert/patch-1
Valeriy Sizov [Mon, 16 Jul 2012 09:29:02 +0000 (02:29 -0700)]
Merge pull request #1045 from tobert/patch-1

The gitlab.pub file probably shouldn't be world readable, but let's star...

12 years agoMerge pull request #1090 from rjmooney/patch-1
Valeriy Sizov [Mon, 16 Jul 2012 09:18:05 +0000 (02:18 -0700)]
Merge pull request #1090 from rjmooney/patch-1

Clarify the nginx configuration.

12 years agoMerge pull request #1091 from asfaltboy/patch-1
Valeriy Sizov [Mon, 16 Jul 2012 09:15:38 +0000 (02:15 -0700)]
Merge pull request #1091 from asfaltboy/patch-1

Add step to make sure tmp directory exists in /home/gitlab/gitlab/

12 years agoMerge pull request #1093 from hfase01/master
Valeriy Sizov [Mon, 16 Jul 2012 09:12:55 +0000 (02:12 -0700)]
Merge pull request #1093 from hfase01/master

Updated libreadline in docs.

12 years agolibreadline-gplv2-dev >> libreadline6-dev
Hans Fase [Sun, 15 Jul 2012 20:17:46 +0000 (17:17 -0300)]
libreadline-gplv2-dev >> libreadline6-dev

12 years agoAdd step to make sure tmp directory exists in /home/gitlab/gitlab/ (since the step...
Pavel Savchenko [Sat, 14 Jul 2012 07:09:26 +0000 (10:09 +0300)]
Add step to make sure tmp directory exists in /home/gitlab/gitlab/ (since the step Setup DB fails if it doesn't. see issue #1038 for more detials.

12 years agoClarify the nginx configuration.
rjmooney [Fri, 13 Jul 2012 17:26:52 +0000 (10:26 -0700)]
Clarify the nginx configuration.

12 years agoMerge pull request #1087 from m16a1/patch-1
Nihad Abbasov [Fri, 13 Jul 2012 13:12:55 +0000 (06:12 -0700)]
Merge pull request #1087 from m16a1/patch-1

Fix typo in spec

12 years agoUpdate master
m16a1 [Fri, 13 Jul 2012 13:10:30 +0000 (17:10 +0400)]
Update master

12 years agoTree ajax log. progress bar & refactoring
Dmitriy Zaporozhets [Tue, 10 Jul 2012 20:12:38 +0000 (23:12 +0300)]
Tree ajax log. progress bar & refactoring

12 years agoFeature: ajax load for tree commit log
randx [Tue, 10 Jul 2012 19:52:38 +0000 (22:52 +0300)]
Feature: ajax load for tree commit log

12 years agoLast push widget improved
randx [Tue, 10 Jul 2012 18:26:01 +0000 (21:26 +0300)]
Last push widget improved

12 years agoMerge pull request #1075 from VonC/master
Dmitriy Zaporozhets [Wed, 11 Jul 2012 14:50:22 +0000 (07:50 -0700)]
Merge pull request #1075 from VonC/master

Look for 'gitolite_admin_uri' in the right section of 'gitlab.yml'.

12 years agoLook for 'gitolite_admin_uri' in the right section
VonC [Wed, 11 Jul 2012 14:36:00 +0000 (16:36 +0200)]
Look for 'gitolite_admin_uri' in the right section
of 'gitlab.yml'.

gitlabhq\config\initializers\1_settings.rb looks for
'gitolite_admin_uri' in the 'git' section of 'gitlab.yml'

Actually, that setting is in the 'git_host' section.
If not fixed, the 'gitolite_admin_uri' would always be equals to
'git@localhost:gitolite-admin', even if the administrator wants
to have another user than 'git' in charge of that repo.

12 years agoMerge pull request #1065 from moregeek/rake_task_for_backup_whole_gitlab
Dmitriy Zaporozhets [Wed, 11 Jul 2012 06:57:20 +0000 (23:57 -0700)]
Merge pull request #1065 from moregeek/rake_task_for_backup_whole_gitlab

add: rake task to backup/restore gitlab db and repos

12 years agoCSS improvements & refactoring
randx [Tue, 10 Jul 2012 17:15:33 +0000 (20:15 +0300)]
CSS improvements & refactoring

12 years agoChanges done as per feedback
Stefan Morgenthaler [Tue, 10 Jul 2012 14:12:19 +0000 (16:12 +0200)]
Changes done as per feedback

12 years agoMerge pull request #1069 from drt24/patch-1
Valeriy Sizov [Tue, 10 Jul 2012 13:16:42 +0000 (06:16 -0700)]
Merge pull request #1069 from drt24/patch-1

Should append to .profile rather than overwriting it as it might have ex...

12 years agoShould append to .profile rather than overwriting it as it might have existing contents
Daniel Thomas [Tue, 10 Jul 2012 10:47:30 +0000 (12:47 +0200)]
Should append to .profile rather than overwriting it as it might have existing contents

12 years agoMerge pull request #1067 from SaitoWu/bugfix/encoding
Dmitriy Zaporozhets [Tue, 10 Jul 2012 08:08:31 +0000 (01:08 -0700)]
Merge pull request #1067 from SaitoWu/bugfix/encoding

fix blame encoding error.

12 years agofix blame encoding error.
Saito [Tue, 10 Jul 2012 07:57:43 +0000 (15:57 +0800)]
fix blame encoding error.

12 years agoMerge pull request #1064 from iamntz/menus_updater
Dmitriy Zaporozhets [Tue, 10 Jul 2012 06:03:09 +0000 (23:03 -0700)]
Merge pull request #1064 from iamntz/menus_updater

Live issues counter updates

12 years agoissues counter are now live updated on creation/deleteion/reopening \85
Staicu Ionut [Tue, 10 Jul 2012 04:33:04 +0000 (07:33 +0300)]
issues counter are now live updated on creation/deleteion/reopening \85
buttons on forms are disabled on submit (re-enabled after the request is complete)

12 years agoadd: rake task to backup/restore gitlab db and repos
Stefan Morgenthaler [Mon, 9 Jul 2012 21:45:43 +0000 (23:45 +0200)]
add: rake task to backup/restore gitlab db and repos

12 years agoApi page in help
randx [Fri, 6 Jul 2012 00:05:12 +0000 (03:05 +0300)]
Api page in help

12 years agoBetter event feed for dashboard
randx [Thu, 5 Jul 2012 23:16:41 +0000 (02:16 +0300)]
Better event feed for dashboard

12 years agofix devise migrations issue
Nihad Abbasov [Fri, 6 Jul 2012 15:46:26 +0000 (20:46 +0500)]
fix devise migrations issue

12 years agoMerge pull request #1048 from NARKOZ/devise
Nihad Abbasov [Fri, 6 Jul 2012 15:35:38 +0000 (08:35 -0700)]
Merge pull request #1048 from NARKOZ/devise

uncomment authentication_token

12 years agooops, uncomment authentication_token
Nihad Abbasov [Fri, 6 Jul 2012 15:33:08 +0000 (21:33 +0600)]
oops, uncomment authentication_token

12 years agoMerge pull request #1012 from NARKOZ/devise
Dmitriy Zaporozhets [Fri, 6 Jul 2012 15:18:18 +0000 (08:18 -0700)]
Merge pull request #1012 from NARKOZ/devise

Add 10 minutes lock after 10 failed login attempts (Devise :lockable)

12 years agoenable lockable strategy for users
Nihad Abbasov [Fri, 6 Jul 2012 07:05:31 +0000 (00:05 -0700)]
enable lockable strategy for users

12 years agoupdate devise
Nihad Abbasov [Fri, 6 Jul 2012 06:50:24 +0000 (23:50 -0700)]
update devise

12 years agoThe gitlab.pub file probably shouldn't be world readable, but let's start with just...
Al Tobey [Thu, 5 Jul 2012 22:25:53 +0000 (15:25 -0700)]
The gitlab.pub file probably shouldn't be world readable, but let's start with just making it read-only and not executable.

12 years agoCompare images
Dmitriy Zaporozhets [Thu, 5 Jul 2012 20:19:37 +0000 (23:19 +0300)]
Compare images

12 years agoFix tree css class conflict
Dmitriy Zaporozhets [Fri, 6 Jul 2012 13:42:13 +0000 (16:42 +0300)]
Fix tree css class conflict

12 years agoMR: Handle broken diff ex. in case its too huge
Dmitriy Zaporozhets [Thu, 5 Jul 2012 19:59:37 +0000 (22:59 +0300)]
MR: Handle broken diff ex. in case its too huge

12 years agoAdmin gitolite logs. Refactored project creation. Few style fixes.
Dmitriy Zaporozhets [Thu, 5 Jul 2012 18:59:37 +0000 (21:59 +0300)]
Admin gitolite logs. Refactored project creation. Few style fixes.

12 years agoRemove GITLAB_OPTS, fixed ldap user creation
randx [Thu, 5 Jul 2012 18:29:37 +0000 (21:29 +0300)]
Remove GITLAB_OPTS, fixed ldap user creation

12 years agoMerge pull request #1030 from brynary/master
Dmitriy Zaporozhets [Thu, 5 Jul 2012 16:39:24 +0000 (09:39 -0700)]
Merge pull request #1030 from brynary/master

Add Code Climate badge

12 years agoMerge pull request #1043 from NARKOZ/api
Dmitriy Zaporozhets [Thu, 5 Jul 2012 16:23:24 +0000 (09:23 -0700)]
Merge pull request #1043 from NARKOZ/api

API docs

12 years agofix typo
Nihad Abbasov [Thu, 5 Jul 2012 15:20:01 +0000 (21:20 +0600)]
fix typo

12 years agoreturn 404 when record not found
Nihad Abbasov [Thu, 5 Jul 2012 15:12:09 +0000 (08:12 -0700)]
return 404 when record not found

12 years agoadd docs for existing API
Nihad Abbasov [Thu, 5 Jul 2012 13:57:45 +0000 (06:57 -0700)]
add docs for existing API

12 years agodon't expose full user info unless needed
Nihad Abbasov [Thu, 5 Jul 2012 13:47:00 +0000 (06:47 -0700)]
don't expose full user info unless needed

12 years agobuttons margin fixed
Dmitriy Zaporozhets [Thu, 5 Jul 2012 06:35:23 +0000 (09:35 +0300)]
buttons margin fixed

12 years agoMerge pull request #1026 from gitlabhq/inline_diff
Dmitriy Zaporozhets [Thu, 5 Jul 2012 05:45:52 +0000 (22:45 -0700)]
Merge pull request #1026 from gitlabhq/inline_diff

Inline diff

12 years agoTabs styled. MR Get Patch
randx [Wed, 4 Jul 2012 22:26:23 +0000 (01:26 +0300)]
Tabs styled. MR Get Patch

12 years agoInlineDiff: fix bug "unmatched close parenthesis"
Valeriy Sizov [Wed, 4 Jul 2012 21:57:12 +0000 (00:57 +0300)]
InlineDiff: fix bug "unmatched close parenthesis"

12 years agoMerge pull request #1034 from NARKOZ/api
Dmitriy Zaporozhets [Wed, 4 Jul 2012 15:36:06 +0000 (08:36 -0700)]
Merge pull request #1034 from NARKOZ/api

API version

12 years agoability to update and get a raw snippet via API
Nihad Abbasov [Wed, 4 Jul 2012 09:03:32 +0000 (02:03 -0700)]
ability to update and get a raw snippet via API

12 years agoadd API version
Nihad Abbasov [Wed, 4 Jul 2012 07:48:00 +0000 (00:48 -0700)]
add API version

12 years agoAdd Code Climate badge
Bryan Helmkamp [Tue, 3 Jul 2012 21:21:58 +0000 (18:21 -0300)]
Add Code Climate badge

12 years agoRefactored navigation
Dmitriy Zaporozhets [Tue, 3 Jul 2012 17:52:48 +0000 (20:52 +0300)]
Refactored navigation

12 years agofix port issue
Dmitriy Zaporozhets [Tue, 3 Jul 2012 15:52:48 +0000 (18:52 +0300)]
fix port issue

12 years agoSetting: Disable port if https
Dmitriy Zaporozhets [Tue, 3 Jul 2012 15:34:47 +0000 (18:34 +0300)]
Setting: Disable port if https

12 years agoMerge branch 'feature/issues_sorting_disabled' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 3 Jul 2012 12:53:50 +0000 (12:53 +0000)]
Merge branch 'feature/issues_sorting_disabled' of dev.gitlabhq.com:gitlabhq

12 years agoInlineDiff: small cleaning
Valeriy Sizov [Mon, 2 Jul 2012 20:39:38 +0000 (23:39 +0300)]
InlineDiff: small cleaning

12 years agoInlineDiff: refactoring
Valeriy Sizov [Mon, 2 Jul 2012 20:34:25 +0000 (23:34 +0300)]
InlineDiff: refactoring

12 years agoInlineDiff: base implementation
Valeriy Sizov [Mon, 2 Jul 2012 20:08:07 +0000 (23:08 +0300)]
InlineDiff: base implementation

12 years agoMerge branch 'feature/config' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Mon, 2 Jul 2012 19:29:15 +0000 (19:29 +0000)]
Merge branch 'feature/config' of dev.gitlabhq.com:gitlabhq

12 years agoFinished with configs
randx [Mon, 2 Jul 2012 18:59:48 +0000 (21:59 +0300)]
Finished with configs

12 years agoDisable issues sort. Recent issues on top. Fixed tests
Dmitriy Zaporozhets [Mon, 2 Jul 2012 18:51:48 +0000 (21:51 +0300)]
Disable issues sort. Recent issues on top. Fixed tests

12 years agoEpic: Gitlab configuration with default values
Dmitriy Zaporozhets [Mon, 2 Jul 2012 18:51:48 +0000 (21:51 +0300)]
Epic: Gitlab configuration with default values

12 years agoFix MR tab width
Dmitriy Zaporozhets [Mon, 2 Jul 2012 09:15:23 +0000 (12:15 +0300)]
Fix MR tab width

12 years agoMerge pull request #1023 from SaitoWu/feature/https
Dmitriy Zaporozhets [Mon, 2 Jul 2012 08:52:23 +0000 (01:52 -0700)]
Merge pull request #1023 from SaitoWu/feature/https

Feature/https

12 years agobypass gitolite update hook, and set an GL_USER variable.
Saito [Mon, 2 Jul 2012 08:44:45 +0000 (16:44 +0800)]
bypass gitolite update hook, and set an GL_USER variable.

12 years agodot needs a escape.
Saito [Mon, 2 Jul 2012 03:07:21 +0000 (11:07 +0800)]
dot needs a escape.