OSDN Git Service
Dmitriy Zaporozhets [Tue, 28 May 2013 15:00:44 +0000 (18:00 +0300)]
Correct indentation in readme, fixed display of social accounts in profile
Dmitriy Zaporozhets [Tue, 28 May 2013 14:37:23 +0000 (17:37 +0300)]
Warn users to change password after account was created
Dmitriy Zaporozhets [Tue, 28 May 2013 14:24:23 +0000 (17:24 +0300)]
Version up to 5.3.0
Dmitriy Zaporozhets [Tue, 28 May 2013 14:08:21 +0000 (17:08 +0300)]
init.d: Ensure socket is removed before starting service
Yves Senn [Tue, 28 May 2013 07:14:29 +0000 (00:14 -0700)]
Merge pull request #4093 from bbodenmiller/breaking-tests
update pull request guidelines, allow for submitting of tests that expos...
Dmitriy Zaporozhets [Mon, 27 May 2013 18:02:42 +0000 (21:02 +0300)]
Fix 500 error on group.settings page
Dmitriy Zaporozhets [Mon, 27 May 2013 15:26:51 +0000 (08:26 -0700)]
Merge pull request #4067 from bbodenmiller/patch-5
add code comment about backing up folder when restoring
Dmitriy Zaporozhets [Mon, 27 May 2013 14:14:47 +0000 (17:14 +0300)]
Up grape version. Fix issue with raw content being escaped
Dmitriy Zaporozhets [Mon, 27 May 2013 12:47:20 +0000 (12:47 +0000)]
Merge branch 'double-check-after-start' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 27 May 2013 12:43:44 +0000 (15:43 +0300)]
more descriptive confirmation messages
Dmitriy Zaporozhets [Mon, 27 May 2013 12:18:59 +0000 (05:18 -0700)]
Merge pull request #4009 from hiroponz/use-default-cursor-on-network-graph
Use default cursor on network graph.
Dmitriy Zaporozhets [Mon, 27 May 2013 12:17:36 +0000 (15:17 +0300)]
Merge branch 'dmedvinsky-add-defaults-create-group-team'
Dmitriy Zaporozhets [Mon, 27 May 2013 12:17:06 +0000 (15:17 +0300)]
Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team
Conflicts:
config/gitlab.yml.example
Dmitriy Zaporozhets [Mon, 27 May 2013 12:12:21 +0000 (05:12 -0700)]
Merge pull request #4000 from babatakao/fix_link_404
Fix link 404.
Dmitriy Zaporozhets [Mon, 27 May 2013 12:05:12 +0000 (15:05 +0300)]
Merge branch 'former03-feature_teams_api'
Dmitriy Zaporozhets [Mon, 27 May 2013 12:05:01 +0000 (15:05 +0300)]
Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq into former03-feature_teams_api
Conflicts:
doc/api/README.md
Ben Bodenmiller [Mon, 27 May 2013 10:46:16 +0000 (04:46 -0600)]
update pull request guidelines, allow for submitting of tests that expose existing failures
Dmitriy Zaporozhets [Mon, 27 May 2013 11:56:07 +0000 (04:56 -0700)]
Merge pull request #4076 from bke-drewb/4023
Fix regression caused by using newer version of Grape
Ben Bodenmiller [Mon, 27 May 2013 11:35:54 +0000 (04:35 -0700)]
clarify restore
Yves Senn [Mon, 27 May 2013 11:01:46 +0000 (04:01 -0700)]
Merge pull request #4092 from bbodenmiller/update-issue-guidelines
improved issue reporting guidelines
Ben Bodenmiller [Mon, 27 May 2013 10:39:59 +0000 (03:39 -0700)]
improved issue reporting guidelines
Dmitriy Zaporozhets [Mon, 27 May 2013 10:03:30 +0000 (03:03 -0700)]
Merge pull request #4072 from ndpgroup/import_w_groups
Include groups in import with import repos rake task
Dmitriy Zaporozhets [Mon, 27 May 2013 09:47:16 +0000 (02:47 -0700)]
Merge pull request #4075 from bbodenmiller/patch-6
remove branch dependencies in README where not necessary
Dmitriy Zaporozhets [Mon, 27 May 2013 09:46:33 +0000 (02:46 -0700)]
Merge pull request #4077 from bbodenmiller/patch-7
clarify when issue tracker is to be used so as to not contradict issue t...
Dmitriy Zaporozhets [Mon, 27 May 2013 09:45:46 +0000 (02:45 -0700)]
Merge pull request #4090 from bbodenmiller/master
add stack overflow to help page
Dmitriy Zaporozhets [Mon, 27 May 2013 09:45:15 +0000 (02:45 -0700)]
Merge pull request #4079 from bbodenmiller/patch-8
details on looking for correct installation guide
Ben Bodenmiller [Mon, 27 May 2013 08:46:51 +0000 (02:46 -0600)]
add stack overflow to help page
Yves Senn [Mon, 27 May 2013 08:38:02 +0000 (01:38 -0700)]
Merge pull request #4089 from bbodenmiller/master
added stack overflow as support option
Ben Bodenmiller [Mon, 27 May 2013 08:33:12 +0000 (01:33 -0700)]
added stackoverflow as support option
Ben Bodenmiller [Mon, 27 May 2013 07:34:40 +0000 (00:34 -0700)]
clarify when issue tracker is to be used so as to not contradict issue tracker guidelines and maintenance policy
Ben Bodenmiller [Mon, 27 May 2013 07:32:58 +0000 (00:32 -0700)]
remove branch dependencies where not necessary
Dmitriy Zaporozhets [Mon, 27 May 2013 05:51:05 +0000 (22:51 -0700)]
Merge pull request #4082 from bbodenmiller/patch-10
no need to download init and nginx files since they are in repo now
Yves Senn [Sun, 26 May 2013 10:30:28 +0000 (03:30 -0700)]
Merge pull request #4080 from babatakao/patch-1
Fixed typo in CHANGELOG.md
Yves Senn [Sun, 26 May 2013 10:30:07 +0000 (03:30 -0700)]
Merge pull request #4081 from bbodenmiller/patch-9
styling and typo fixes in installation guide
Ben Bodenmiller [Sun, 26 May 2013 04:51:12 +0000 (22:51 -0600)]
no need to download init and nginx files since they are in repo now
Ben Bodenmiller [Sun, 26 May 2013 04:40:09 +0000 (22:40 -0600)]
styling and typo fixes in installation guide
Takao Baba [Sun, 26 May 2013 04:39:46 +0000 (13:39 +0900)]
Fixed typo in CHANGELOG.md
Ben Bodenmiller [Sun, 26 May 2013 04:15:04 +0000 (21:15 -0700)]
details on looking for correct installation guide
addresses gitlabhq/gitlabhq#3809
Drew Blessing [Sun, 26 May 2013 00:43:51 +0000 (19:43 -0500)]
Fix regression caused by using newer version of Grape
This commit fixes the regression caused by using a newer version of Grape and Grape entity. This solves Issue 4023.
James E. Flemer [Sat, 25 May 2013 17:38:55 +0000 (11:38 -0600)]
Include groups in import with import repos rake task
Expand the import glob to include `**/*.git` to find projects in groups
as well as top level projects. Check for existing group, and create
group if needed. Set namespace_id for imported projects.
Dmitriy Zaporozhets [Fri, 24 May 2013 21:20:08 +0000 (00:20 +0300)]
Ask people to remove 1.8 ruby to prevent issues
Dmitriy Zaporozhets [Fri, 24 May 2013 21:07:19 +0000 (00:07 +0300)]
Rename repo feature
Dmitriy Zaporozhets [Fri, 24 May 2013 20:38:33 +0000 (23:38 +0300)]
Update CHANGELOG
Dmitriy Zaporozhets [Fri, 24 May 2013 20:35:43 +0000 (13:35 -0700)]
Merge pull request #4063 from ronaldvaneede/hipchat-service
Hipchat service implementation
Dmitriy Zaporozhets [Fri, 24 May 2013 20:17:07 +0000 (23:17 +0300)]
Fix google analytics setting being ignored
Ronald van Eede [Thu, 23 May 2013 18:10:32 +0000 (20:10 +0200)]
Hipchat service implementation
Dmitriy Zaporozhets [Fri, 24 May 2013 17:36:28 +0000 (20:36 +0300)]
Fix ldap auth for http push
Dmitriy Zaporozhets [Fri, 24 May 2013 16:43:47 +0000 (19:43 +0300)]
Restyle login page for LDAP/regular login
Dmitriy Zaporozhets [Fri, 24 May 2013 14:12:27 +0000 (17:12 +0300)]
Dont allow LDAP users to change password inside GitLab
Dmitriy Zaporozhets [Fri, 24 May 2013 06:49:49 +0000 (09:49 +0300)]
respect newlines for wall messages
Dmitriy Zaporozhets [Thu, 23 May 2013 09:27:34 +0000 (02:27 -0700)]
Merge pull request #3964 from mhfan/improve-sidekiq-check
improve regrex for match(sidekiq) robustness
Dmitriy Zaporozhets [Thu, 23 May 2013 09:26:06 +0000 (12:26 +0300)]
fix missing user2 in api:repositories specs
Dmitriy Zaporozhets [Thu, 23 May 2013 09:23:47 +0000 (12:23 +0300)]
split repositories and projects api
Dmitriy Zaporozhets [Thu, 23 May 2013 08:54:44 +0000 (11:54 +0300)]
Update poltergeist and should-matchers
Dmitriy Zaporozhets [Thu, 23 May 2013 08:47:57 +0000 (11:47 +0300)]
Decorate links on focus
Dmitriy Zaporozhets [Thu, 23 May 2013 08:44:24 +0000 (11:44 +0300)]
Fix milestones list pagination style
Dmitriy Zaporozhets [Thu, 23 May 2013 07:05:07 +0000 (10:05 +0300)]
Update bootstrap-sass
Dmitriy Zaporozhets [Thu, 23 May 2013 06:59:54 +0000 (09:59 +0300)]
Update sidekiq & devise
Dmitriy Zaporozhets [Thu, 23 May 2013 06:37:24 +0000 (09:37 +0300)]
Minor improve for code highlight in wiki
Yves Senn [Thu, 23 May 2013 06:25:28 +0000 (23:25 -0700)]
Merge pull request #4035 from samurailink3/master
Fixed typo in Readme.md
Dmitriy Zaporozhets [Thu, 23 May 2013 06:02:14 +0000 (23:02 -0700)]
Merge pull request #4040 from smashwilson/generate-secret
Security: keep the Rails secret token out of version control.
ash [Wed, 22 May 2013 23:55:48 +0000 (23:55 +0000)]
Generate the Rails secret token on first run.
Store the secret token in a .gitignored file called ".secret", which is
created by the initializer if it doesn't exist.
Dmitriy Zaporozhets [Wed, 22 May 2013 17:18:48 +0000 (17:18 +0000)]
Merge branch 'refactor/services' of /home/git/repositories/gitlab/gitlabhq
Tom Webster [Wed, 22 May 2013 16:08:45 +0000 (13:08 -0300)]
Fixed typo in Readme.md
Fixed 22th -> 22nd
Dmitriy Zaporozhets [Wed, 22 May 2013 15:10:51 +0000 (18:10 +0300)]
Fix service tests in spinach
Dmitriy Zaporozhets [Wed, 22 May 2013 14:59:59 +0000 (17:59 +0300)]
Campfire service added
Dmitriy Zaporozhets [Wed, 22 May 2013 14:59:43 +0000 (17:59 +0300)]
Mention methods that should be implemented inside service
Dmitriy Zaporozhets [Wed, 22 May 2013 14:59:15 +0000 (17:59 +0300)]
Add tinder for future campfire integration
Dmitriy Zaporozhets [Wed, 22 May 2013 14:21:05 +0000 (17:21 +0300)]
Add more fields to project service model
Dmitriy Zaporozhets [Wed, 22 May 2013 13:58:44 +0000 (16:58 +0300)]
Make service code more abstract
Dmitriy Zaporozhets [Wed, 22 May 2013 13:12:30 +0000 (16:12 +0300)]
Replace all occurs of {{created_at}} at project wall
Dmitriy Zaporozhets [Wed, 22 May 2013 11:06:31 +0000 (14:06 +0300)]
Use separate property for project path and project path with namespace inside system hook
Dmitriy Zaporozhets [Wed, 22 May 2013 11:06:08 +0000 (14:06 +0300)]
Fix huge MR exceptions. Fixed link to diff for it
Dmitriy Zaporozhets [Wed, 22 May 2013 10:39:00 +0000 (13:39 +0300)]
include namespace in project path for system hook
Dmitriy Zaporozhets [Wed, 22 May 2013 06:50:09 +0000 (09:50 +0300)]
handle broken diffs gracefully
Dmitriy Zaporozhets [Wed, 22 May 2013 06:00:52 +0000 (23:00 -0700)]
Merge pull request #4018 from dolphin333/fix_cancel_button_link_on_edit_files_page
Fix cancel button link on edit files page
Christian Simon [Tue, 21 May 2013 21:13:30 +0000 (23:13 +0200)]
[FEATURE] Basic user_teams api
* Closing #3066
* Closing #3609
Dolphin [Tue, 21 May 2013 17:33:54 +0000 (02:33 +0900)]
Fix cancel button link on edit files page
Sato Hiroyuki [Tue, 21 May 2013 00:25:25 +0000 (09:25 +0900)]
Use default cursor on network graph.
The cross 'move' cursor doesen't work if you can't it around.
refs #3741
babatakao [Mon, 20 May 2013 12:00:05 +0000 (21:00 +0900)]
Fix link 404.
Dmitriy Zaporozhets [Mon, 20 May 2013 11:52:06 +0000 (14:52 +0300)]
Replace 5-1-stable with 5-2-stable in installation docs
Dmitriy Zaporozhets [Mon, 20 May 2013 11:46:39 +0000 (14:46 +0300)]
Version up to 5.2
Dmitriy Zaporozhets [Mon, 20 May 2013 11:22:18 +0000 (14:22 +0300)]
Better remove project message
Sytse Sijbrandij [Mon, 20 May 2013 07:46:24 +0000 (09:46 +0200)]
GitLab must run before the check is done.
Sytse Sijbrandij [Mon, 20 May 2013 07:44:20 +0000 (09:44 +0200)]
Give examples that have been reported frequently.
Dmitriy Zaporozhets [Mon, 20 May 2013 06:25:03 +0000 (23:25 -0700)]
Merge pull request #3990 from bbodenmiller/patch-gitlab-cap
changed Gitlab to GitLab in user facing locations
Ben Bodenmiller [Sun, 19 May 2013 09:13:39 +0000 (02:13 -0700)]
changed Gitlab to GitLab
Yves Senn [Sun, 19 May 2013 08:25:09 +0000 (01:25 -0700)]
Merge pull request #3972 from Razer6/master
Fix small typo in install docs, Closes #3723
Yves Senn [Sun, 19 May 2013 07:41:40 +0000 (00:41 -0700)]
Merge pull request #3983 from bbodenmiller/patch-1
Typo fixes in cleanup.md
Yves Senn [Sun, 19 May 2013 07:40:58 +0000 (00:40 -0700)]
Merge pull request #3987 from bbodenmiller/patch-3
Typo fix in database.md closes 3984
Yves Senn [Sun, 19 May 2013 07:40:02 +0000 (00:40 -0700)]
Merge pull request #3988 from crazyscience/patch-3
Fixed grammatical error.
crazyscience [Sat, 18 May 2013 22:46:48 +0000 (16:46 -0600)]
Fixed grammatical error.
Ben Bodenmiller [Sat, 18 May 2013 12:39:33 +0000 (06:39 -0600)]
Typo fix closes gitlabhq/gitlabhq/3984
Dmitriy Zaporozhets [Sat, 18 May 2013 06:46:14 +0000 (09:46 +0300)]
Update docs for 5.2
Dmitriy Zaporozhets [Sat, 18 May 2013 06:44:54 +0000 (09:44 +0300)]
Gitlab-shell should be 1.4.0 for GitLab 5.2
Ben Bodenmiller [Fri, 17 May 2013 22:39:55 +0000 (16:39 -0600)]
Typo fixes
Robert Schilling [Thu, 16 May 2013 20:16:41 +0000 (22:16 +0200)]
Fix typo in install docs, closes #3723
Dmitriy Zaporozhets [Thu, 16 May 2013 14:32:36 +0000 (17:32 +0300)]
Its time for 5.2.0.rc1
Dmitry Medvinsky [Mon, 11 Mar 2013 06:44:45 +0000 (10:44 +0400)]
Add settings for user permission defaults
“Can create groups” and “Can create teams” had hardcoded defaults to
`true`. Sometimes it is desirable to prohibit these for newly created
users by default.
Dmitriy Zaporozhets [Thu, 16 May 2013 12:12:40 +0000 (05:12 -0700)]
Merge pull request #3956 from AlexDenisov/issues_bulk_update
Issues bulk update