OSDN Git Service

wvm/gitlab.git
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 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 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.

12 years agofix 80 port config
randx [Sun, 1 Jul 2012 10:24:47 +0000 (13:24 +0300)]
fix 80 port config

12 years agoImproved header font
randx [Sun, 1 Jul 2012 10:11:17 +0000 (13:11 +0300)]
Improved header font

12 years agoUI: Navifation -> full width tabs
randx [Sat, 30 Jun 2012 22:39:23 +0000 (01:39 +0300)]
UI: Navifation -> full width tabs

12 years agoUI changes:
randx [Sat, 30 Jun 2012 21:35:24 +0000 (00:35 +0300)]
UI changes:
* .page_title  class added. Used for better page headers
* improved help page
* added back links for help pages
* show app version & revision on help page

Backend changes:
* Gitab::Version && Gitlab::Revision constants

12 years agoMerge Request: fix automerge widget
randx [Fri, 29 Jun 2012 19:02:22 +0000 (22:02 +0300)]
Merge Request: fix automerge widget

12 years agoMerge Request -> show. Refactored. f5 support for diff
randx [Fri, 29 Jun 2012 18:55:22 +0000 (21:55 +0300)]
Merge Request -> show. Refactored. f5 support for diff

12 years agoMerge pull request #1019 from NARKOZ/api
Dmitriy Zaporozhets [Fri, 29 Jun 2012 13:45:41 +0000 (06:45 -0700)]
Merge pull request #1019 from NARKOZ/api

API

12 years agoMerge pull request #1020 from SaitoWu/feature/https
Dmitriy Zaporozhets [Fri, 29 Jun 2012 13:44:45 +0000 (06:44 -0700)]
Merge pull request #1020 from SaitoWu/feature/https

Feature/https

12 years agofix a npe, and need a patch for path_info
Saito [Fri, 29 Jun 2012 13:40:23 +0000 (21:40 +0800)]
fix a npe, and need a patch for path_info

12 years agonow works with git clone http://localhost/repo.git now
Saito [Fri, 29 Jun 2012 13:39:40 +0000 (21:39 +0800)]
now works with git clone localhost/repo.git now

12 years agoadd project snippets API
Nihad Abbasov [Fri, 29 Jun 2012 13:34:08 +0000 (06:34 -0700)]
add project snippets API

12 years agoMerge pull request #1018 from glebm/master
Dmitriy Zaporozhets [Fri, 29 Jun 2012 11:53:43 +0000 (04:53 -0700)]
Merge pull request #1018 from glebm/master

Resque Authentication + iFrame view

12 years agoRefs #1013
gleb [Fri, 29 Jun 2012 11:44:55 +0000 (13:44 +0200)]
Refs #1013
Renamed protect_resque.rb => resque_authentication
Integrated resque web with the rest of gitlab

12 years agoMerge pull request #1011 from peikk0/config_projects_limit
Dmitriy Zaporozhets [Fri, 29 Jun 2012 11:23:25 +0000 (04:23 -0700)]
Merge pull request #1011 from peikk0/config_projects_limit

Add configurable default for projects_limit

12 years agoMerge branch 'api' of https://github.com/NARKOZ/gitlabhq
Dmitriy Zaporozhets [Fri, 29 Jun 2012 11:25:20 +0000 (14:25 +0300)]
Merge branch 'api' of https://github.com/NARKOZ/gitlabhq

Conflicts:
Gemfile.lock

12 years agoMerge pull request #1016 from SaitoWu/feature/https
Dmitriy Zaporozhets [Fri, 29 Jun 2012 11:16:20 +0000 (04:16 -0700)]
Merge pull request #1016 from SaitoWu/feature/https

Feature/https

12 years agoAdd configurable default for projects_limit
Pierre GUINOISEAU [Thu, 28 Jun 2012 22:57:10 +0000 (00:57 +0200)]
Add configurable default for projects_limit

12 years agoreturn errors in json format
Nihad Abbasov [Fri, 29 Jun 2012 10:52:20 +0000 (03:52 -0700)]
return errors in json format

12 years agouse gitlabhq/grack instead of my fork
Saito [Fri, 29 Jun 2012 10:49:36 +0000 (18:49 +0800)]
use gitlabhq/grack instead of my fork

12 years agorefactor API and improve docs
Nihad Abbasov [Fri, 29 Jun 2012 10:46:01 +0000 (03:46 -0700)]
refactor API and improve docs

12 years agoimplements protected branches to smart http protocal
Saito [Fri, 29 Jun 2012 10:11:37 +0000 (18:11 +0800)]
implements protected branches to smart http protocal

12 years agoMerge pull request #973 from denispeplin/master
Dmitriy Zaporozhets [Fri, 29 Jun 2012 08:30:09 +0000 (01:30 -0700)]
Merge pull request #973 from denispeplin/master

/home/git/repositories is hardcoded in rake task, replace it

12 years agointegrate with gitlabhq authority
Saito [Fri, 29 Jun 2012 07:43:15 +0000 (15:43 +0800)]
integrate with gitlabhq authority

12 years agomount grack to git, u can 'git clone http://localhost/git/xx.git' now
Saito [Fri, 29 Jun 2012 03:30:31 +0000 (11:30 +0800)]
mount grack to git, u can 'git clone localhost/git/xx.git' now

12 years agoadd grack to support smart http protocal for git
Saito [Fri, 29 Jun 2012 02:52:09 +0000 (10:52 +0800)]
add grack to support smart http protocal for git

12 years agoshow only current user projects
Nihad Abbasov [Thu, 28 Jun 2012 14:02:20 +0000 (07:02 -0700)]
show only current user projects

12 years agoadd projects API
Nihad Abbasov [Wed, 27 Jun 2012 12:51:39 +0000 (05:51 -0700)]
add projects API

12 years agoadd users API
Nihad Abbasov [Wed, 27 Jun 2012 11:32:56 +0000 (04:32 -0700)]
add users API

12 years agoinstall grape and mount Gitlab::API
Nihad Abbasov [Wed, 27 Jun 2012 09:26:16 +0000 (02:26 -0700)]
install grape and mount Gitlab::API

12 years agoNew Feature: Diff patch file export for commit
randx [Thu, 28 Jun 2012 09:51:50 +0000 (12:51 +0300)]
New Feature: Diff patch file export for commit

12 years agoUpdated version & changelog
randx [Thu, 28 Jun 2012 09:24:41 +0000 (12:24 +0300)]
Updated version & changelog

12 years agoFix issue #987 #972
randx [Wed, 27 Jun 2012 21:54:53 +0000 (00:54 +0300)]
Fix issue #987 #972

12 years agoStrict first project symdol to letter
randx [Wed, 27 Jun 2012 21:47:12 +0000 (00:47 +0300)]
Strict first project symdol to letter

12 years agoMerge branch 'feature/issue_tags' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Wed, 27 Jun 2012 21:08:41 +0000 (21:08 +0000)]
Merge branch 'feature/issue_tags' of dev.gitlabhq.com:gitlabhq

12 years agoIssues tags: refactoring
randx [Wed, 27 Jun 2012 20:13:44 +0000 (23:13 +0300)]
Issues tags: refactoring

12 years agoRemove critical status from Issue. Move sort instead
Dmitriy Zaporozhets [Wed, 27 Jun 2012 18:30:35 +0000 (21:30 +0300)]
Remove critical status from Issue. Move sort instead

12 years agoIssue Labels: Edit, show, index + filter
Dmitriy Zaporozhets [Wed, 27 Jun 2012 18:20:35 +0000 (21:20 +0300)]
Issue Labels: Edit, show, index + filter

12 years agoMerge pull request #971 from gingko/master
Dmitriy Zaporozhets [Wed, 27 Jun 2012 06:41:49 +0000 (23:41 -0700)]
Merge pull request #971 from gingko/master

Automatic password creation..

12 years agoFixing requests tests.
Jakub Troszok [Tue, 26 Jun 2012 22:55:54 +0000 (00:55 +0200)]
Fixing requests tests.

12 years agoAdded option to automaticaly generate passwords for new users.
Jakub Troszok [Tue, 26 Jun 2012 21:59:08 +0000 (23:59 +0200)]
Added option to automaticaly generate passwords for new users.