OSDN Git Service
Dmitriy Zaporozhets [Fri, 27 Jul 2012 06:11:46 +0000 (23:11 -0700)]
Merge pull request #1129 from meskyanichi/master
Potential solution for current `rake gitlab:app:backup_restore` issues.
Michael van Rooijen [Sun, 22 Jul 2012 12:48:23 +0000 (14:48 +0200)]
Modified the `repo_dump` and `repo_restore` rake tasks to properly dump and restore repositories based on their `path` rather than their (project) `name`. The project name can be uppercase and may contain spaces. This caused the repository to be restored as a different `path` that it was initially created as, thus, breaking the `git remote` and the web interface can no longer detect the repository either because it searches by `path` and not by `name`. Also, when restoring the permissions are incorrect making it impossible to push new commits to the remote repository. So now on success it'll set the correct permissions (but requires that the `gitlab` user has `sudo` privileges, or this task must be executed as root).
randx [Thu, 26 Jul 2012 13:14:34 +0000 (16:14 +0300)]
Fixed persmission issue in doc. Added validation of hooks in gitlab:app:status
randx [Thu, 26 Jul 2012 11:45:17 +0000 (14:45 +0300)]
Fixed dashboard loader, fixed 404 for reporter on empty wiki page.
Styled Wiki edit page
randx [Wed, 25 Jul 2012 19:08:47 +0000 (22:08 +0300)]
Styled wiki area. fixed commit feed feature
randx [Wed, 25 Jul 2012 18:45:53 +0000 (21:45 +0300)]
Fix compare crash after decorator refactoring
randx [Wed, 25 Jul 2012 18:38:33 +0000 (21:38 +0300)]
Remove recreated mailer controller for admin
randx [Wed, 25 Jul 2012 18:36:30 +0000 (21:36 +0300)]
Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments
Conflicts:
app/controllers/admin/mailer_controller.rb
app/controllers/notes_controller.rb
Dmitriy Zaporozhets [Wed, 25 Jul 2012 18:25:55 +0000 (11:25 -0700)]
Merge pull request #1127 from riyad/use-decorators
Use CommitDecorator more
Dmitriy Zaporozhets [Wed, 25 Jul 2012 18:22:03 +0000 (11:22 -0700)]
Merge pull request #1133 from robbytaylor/master
Updated merge request subheading.
Dmitriy Zaporozhets [Wed, 25 Jul 2012 18:21:32 +0000 (11:21 -0700)]
Merge pull request #1142 from NARKOZ/api
API changes
Nihad Abbasov [Wed, 25 Jul 2012 12:24:28 +0000 (05:24 -0700)]
return 404 if project not found
Nihad Abbasov [Wed, 25 Jul 2012 11:22:21 +0000 (04:22 -0700)]
API: expose issues project id
Nihad Abbasov [Wed, 25 Jul 2012 09:35:41 +0000 (02:35 -0700)]
API: update docs
Nihad Abbasov [Wed, 25 Jul 2012 09:18:30 +0000 (02:18 -0700)]
API: ability to get project by id
Dmitriy Zaporozhets [Wed, 25 Jul 2012 08:51:06 +0000 (01:51 -0700)]
Merge pull request #1118 from patthoyts/pt/ldap-missing-password
Handle LDAP missing credentials error with a flash message.
Dmitriy Zaporozhets [Wed, 25 Jul 2012 08:50:34 +0000 (01:50 -0700)]
Merge pull request #1122 from patthoyts/pt/missing-log
Create the githost.log file if necessary.
Dmitriy Zaporozhets [Wed, 25 Jul 2012 08:48:00 +0000 (01:48 -0700)]
Merge pull request #1135 from NARKOZ/api
Issues API
Nihad Abbasov [Tue, 24 Jul 2012 12:52:43 +0000 (05:52 -0700)]
update help section with issues API docs
Nihad Abbasov [Tue, 24 Jul 2012 12:46:36 +0000 (05:46 -0700)]
Merge branch 'master' into api
Nihad Abbasov [Tue, 24 Jul 2012 12:25:01 +0000 (05:25 -0700)]
update API docs
Nihad Abbasov [Tue, 24 Jul 2012 12:19:51 +0000 (05:19 -0700)]
add issues API
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.
Riyad Preukschas [Sun, 22 Jul 2012 11:08:32 +0000 (13:08 +0200)]
Update specs
Riyad Preukschas [Sun, 22 Jul 2012 11:08:24 +0000 (13:08 +0200)]
Update views to use CommitDecorator
Riyad Preukschas [Sat, 21 Jul 2012 17:37:31 +0000 (19:37 +0200)]
Add CommitDecorator#short_id
Pat Thoyts [Sat, 21 Jul 2012 14:30:09 +0000 (15:30 +0100)]
Create the githost.log file if necessary.
This resolves issue #1121.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Pat Thoyts [Sat, 21 Jul 2012 08:04:05 +0000 (09:04 +0100)]
Handle LDAP missing credentials error with a flash message.
If a user fails to provide a username or password to the LDAP login
form then a 500 error is returned due to an exception being raised
in omniauth-ldap. This gem has been amended to use the omniauth
error propagation function (fail!) to pass this exception message to
the registered omniauth failure handler so that the Rails application
can handle it approriately.
The failure function now knows about standard exceptions and no longer
requires a specific check for the OmniAuth::Error exception added by
commit
f322975.
This resolves issue #1077.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
randx [Sat, 21 Jul 2012 07:53:55 +0000 (10:53 +0300)]
Up to 2.7.0
randx [Sat, 21 Jul 2012 07:47:57 +0000 (10:47 +0300)]
Help section for system hooks completed
randx [Sat, 21 Jul 2012 07:32:42 +0000 (10:32 +0300)]
Fix system hook example
randx [Sat, 21 Jul 2012 07:27:09 +0000 (10:27 +0300)]
move SSH keys tab closer to begining
randx [Sat, 21 Jul 2012 07:23:05 +0000 (10:23 +0300)]
Endless event loading for dsahboard
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.
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>
Ian Morgan [Fri, 20 Jul 2012 17:16:19 +0000 (13:16 -0400)]
Show wiki comments for all revisions
Dmitriy Zaporozhets [Fri, 20 Jul 2012 14:24:56 +0000 (14:24 +0000)]
Merge branch 'refactoring_controllers' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Fri, 20 Jul 2012 05:39:34 +0000 (08:39 +0300)]
Box shadow for boxes
Dmitriy Zaporozhets [Fri, 20 Jul 2012 09:08:16 +0000 (09:08 +0000)]
Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Fri, 20 Jul 2012 09:08:59 +0000 (12:08 +0300)]
Enable observe for system hooks
Dmitriy Zaporozhets [Fri, 20 Jul 2012 05:39:34 +0000 (08:39 +0300)]
BaseContext
Controllers refactoring with contexts
Move commit compare logic to model
Ian Morgan [Fri, 20 Jul 2012 00:09:19 +0000 (20:09 -0400)]
Add comments to Wiki pages
Valeriy Sizov [Thu, 19 Jul 2012 22:01:29 +0000 (01:01 +0300)]
System Hooks: move callback to observer
Dmitriy Zaporozhets [Thu, 19 Jul 2012 04:05:57 +0000 (07:05 +0300)]
Fix comments in MR. Fixed event destroy with user
Dmitriy Zaporozhets [Thu, 19 Jul 2012 09:52:28 +0000 (12:52 +0300)]
Ignore backups dir
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
Valeriy Sizov [Wed, 18 Jul 2012 21:24:37 +0000 (00:24 +0300)]
System Hooks: rspec
Valeriy Sizov [Sun, 15 Jul 2012 14:36:06 +0000 (17:36 +0300)]
System hooks: fix broken tests
Valeriy Sizov [Sun, 15 Jul 2012 12:29:06 +0000 (15:29 +0300)]
System Hook: implemented
Valeriy Sizov [Thu, 12 Jul 2012 19:10:34 +0000 (22:10 +0300)]
System Hooks: CRUD has done
Valeriy Sizov [Thu, 12 Jul 2012 12:36:33 +0000 (15:36 +0300)]
Refactoring of hook functionality & bootsrap system hooks
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
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.
Michael Richardson [Wed, 18 Jul 2012 10:59:32 +0000 (11:59 +0100)]
Fixing MySQL syntax error
Dmitriy Zaporozhets [Tue, 17 Jul 2012 05:23:16 +0000 (08:23 +0300)]
CHANGELOG updated. Fixed MR bug. Logger improved
Dmitriy Zaporozhets [Tue, 17 Jul 2012 05:21:16 +0000 (08:21 +0300)]
Colored labels for events on dashboard
Dmitriy Zaporozhets [Tue, 17 Jul 2012 05:19:16 +0000 (08:19 +0300)]
Feature: Unassigned Merge Requests
Dmitriy Zaporozhets [Tue, 17 Jul 2012 05:17:16 +0000 (08:17 +0300)]
MR index pollished
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>
moregeek [Mon, 16 Jul 2012 12:01:32 +0000 (14:01 +0200)]
show flash notice after deletion of a project
Dmitriy Zaporozhets [Mon, 16 Jul 2012 05:03:10 +0000 (08:03 +0300)]
Admin logs improved. Commits list box styled
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...
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.
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/
Valeriy Sizov [Mon, 16 Jul 2012 09:12:55 +0000 (02:12 -0700)]
Merge pull request #1093 from hfase01/master
Updated libreadline in docs.
Hans Fase [Sun, 15 Jul 2012 20:17:46 +0000 (17:17 -0300)]
libreadline-gplv2-dev >> libreadline6-dev
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.
rjmooney [Fri, 13 Jul 2012 17:26:52 +0000 (10:26 -0700)]
Clarify the nginx configuration.
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
m16a1 [Fri, 13 Jul 2012 13:10:30 +0000 (17:10 +0400)]
Update master
Dmitriy Zaporozhets [Tue, 10 Jul 2012 20:12:38 +0000 (23:12 +0300)]
Tree ajax log. progress bar & refactoring
randx [Tue, 10 Jul 2012 19:52:38 +0000 (22:52 +0300)]
Feature: ajax load for tree commit log
randx [Tue, 10 Jul 2012 18:26:01 +0000 (21:26 +0300)]
Last push widget improved
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'.
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.
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
randx [Tue, 10 Jul 2012 17:15:33 +0000 (20:15 +0300)]
CSS improvements & refactoring
Stefan Morgenthaler [Tue, 10 Jul 2012 14:12:19 +0000 (16:12 +0200)]
Changes done as per feedback
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...
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
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.
Saito [Tue, 10 Jul 2012 07:57:43 +0000 (15:57 +0800)]
fix blame encoding error.
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
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)
Stefan Morgenthaler [Mon, 9 Jul 2012 21:45:43 +0000 (23:45 +0200)]
add: rake task to backup/restore gitlab db and repos
Nihad Abbasov [Fri, 6 Jul 2012 13:08:17 +0000 (06:08 -0700)]
refactor projects API
randx [Fri, 6 Jul 2012 00:05:12 +0000 (03:05 +0300)]
Api page in help
randx [Thu, 5 Jul 2012 23:16:41 +0000 (02:16 +0300)]
Better event feed for dashboard
Nihad Abbasov [Fri, 6 Jul 2012 15:46:26 +0000 (20:46 +0500)]
fix devise migrations issue
Nihad Abbasov [Fri, 6 Jul 2012 15:35:38 +0000 (08:35 -0700)]
Merge pull request #1048 from NARKOZ/devise
uncomment authentication_token
Nihad Abbasov [Fri, 6 Jul 2012 15:33:08 +0000 (21:33 +0600)]
oops, uncomment authentication_token
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)
Nihad Abbasov [Fri, 6 Jul 2012 07:05:31 +0000 (00:05 -0700)]
enable lockable strategy for users
Nihad Abbasov [Fri, 6 Jul 2012 06:50:24 +0000 (23:50 -0700)]
update devise
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.
Dmitriy Zaporozhets [Thu, 5 Jul 2012 20:19:37 +0000 (23:19 +0300)]
Compare images
Dmitriy Zaporozhets [Fri, 6 Jul 2012 13:42:13 +0000 (16:42 +0300)]
Fix tree css class conflict
Dmitriy Zaporozhets [Thu, 5 Jul 2012 19:59:37 +0000 (22:59 +0300)]
MR: Handle broken diff ex. in case its too huge
Dmitriy Zaporozhets [Thu, 5 Jul 2012 18:59:37 +0000 (21:59 +0300)]
Admin gitolite logs. Refactored project creation. Few style fixes.
randx [Thu, 5 Jul 2012 18:29:37 +0000 (21:29 +0300)]
Remove GITLAB_OPTS, fixed ldap user creation