OSDN Git Service
Dmitriy Zaporozhets [Mon, 3 Jun 2013 18:01:07 +0000 (21:01 +0300)]
Fix deploy key api 500 if key is empty
Dmitriy Zaporozhets [Mon, 3 Jun 2013 16:49:04 +0000 (19:49 +0300)]
Add api to collect owned user projects. Api deploy_key.create: Enable deploy key if it exist in other owned project
Dmitriy Zaporozhets [Mon, 3 Jun 2013 06:34:10 +0000 (23:34 -0700)]
Merge pull request #4161 from Undev/fix-#4109
Fix bug with team assignation on project from #4109
Dmitriy Zaporozhets [Mon, 3 Jun 2013 06:31:43 +0000 (23:31 -0700)]
Merge pull request #4158 from evalhub/master
Group/Team Atom feed 500 error
Andrey Kumanyaev [Sat, 1 Jun 2013 15:40:20 +0000 (19:40 +0400)]
No check access if no relation between user and project
Andrey Kumanyaev [Sat, 1 Jun 2013 15:24:15 +0000 (19:24 +0400)]
Fix bug with team assignation on project from #4109
evalhub [Sat, 1 Jun 2013 12:15:22 +0000 (15:15 +0300)]
Update show.atom.builder
Fix for https://github.com/gitlabhq/gitlabhq/issues/4157
evalhub [Sat, 1 Jun 2013 12:14:43 +0000 (15:14 +0300)]
Update show.atom.builder
Fix for https://github.com/gitlabhq/gitlabhq/issues/4157
Yves Senn [Fri, 31 May 2013 07:24:49 +0000 (00:24 -0700)]
Merge pull request #4147 from andrewwutw/fix-issue-tracker-guidelines-cmd-line
Fix rake gitlab:env:info command line in Issue tracker guidelines.
andrewwutw [Fri, 31 May 2013 07:17:12 +0000 (15:17 +0800)]
Fix rake gitlab:env:info command line in Issue tracker guidelines.
Dmitriy Zaporozhets [Thu, 30 May 2013 08:44:35 +0000 (11:44 +0300)]
Fix routiong specs after rename of resque controller
Dmitriy Zaporozhets [Thu, 30 May 2013 08:40:15 +0000 (11:40 +0300)]
Update membership instead of remove/add if it permissions were changed
Dmitriy Zaporozhets [Thu, 30 May 2013 08:25:34 +0000 (11:25 +0300)]
UserTeam: Fixed bug when impossible to change admin flag after checked
Dmitriy Zaporozhets [Thu, 30 May 2013 08:13:38 +0000 (11:13 +0300)]
TeamManagement: Dont update permissions if it was not changed
Dmitriy Zaporozhets [Thu, 30 May 2013 07:57:50 +0000 (10:57 +0300)]
Add permission filter to teams -> members page
Dmitriy Zaporozhets [Thu, 30 May 2013 07:57:10 +0000 (10:57 +0300)]
Added TeamMembers.js file
Dmitriy Zaporozhets [Thu, 30 May 2013 06:52:12 +0000 (23:52 -0700)]
Merge pull request #3970 from jacargentina/notes-highlight
Style target notes for easy visual identification
Dmitriy Zaporozhets [Thu, 30 May 2013 06:46:28 +0000 (09:46 +0300)]
Renames resque resource to background_jobs
Dmitriy Zaporozhets [Thu, 30 May 2013 06:46:02 +0000 (09:46 +0300)]
Prevent mailer error when note with code highlight
Dmitriy Zaporozhets [Thu, 30 May 2013 06:29:34 +0000 (23:29 -0700)]
Merge pull request #3980 from hiroponz/fix-not-displaying-slash-of-namespace
Fix not displaying a slash after namespace.
Dmitriy Zaporozhets [Thu, 30 May 2013 06:28:17 +0000 (23:28 -0700)]
Merge pull request #4037 from mitchty/master
Remove user directory path assumptions
Dmitriy Zaporozhets [Thu, 30 May 2013 06:25:40 +0000 (23:25 -0700)]
Merge pull request #4115 from bke-drewb/apidocs
Update api docs and remove old attribute from User entity.
Dmitriy Zaporozhets [Thu, 30 May 2013 06:24:56 +0000 (23:24 -0700)]
Merge pull request #4101 from bassrock/master
Update suggestion for Check.rake
Dmitriy Zaporozhets [Thu, 30 May 2013 06:23:29 +0000 (23:23 -0700)]
Merge pull request #4113 from peterlefanulumsdaine/master
grammar fix in an error message (very minor change)
Dmitriy Zaporozhets [Thu, 30 May 2013 06:17:29 +0000 (23:17 -0700)]
Merge pull request #4130 from TrevorS/fix-update-docs-5.0-5.1
adding update info regarding gitlab-shell config.yml (re: dashboard update problems)
Trevor Strieber [Wed, 29 May 2013 21:03:54 +0000 (15:03 -0600)]
adding update info regarding gitlab-shell config.yml
Dmitriy Zaporozhets [Wed, 29 May 2013 20:26:24 +0000 (23:26 +0300)]
Better styling for event pre block
Dmitriy Zaporozhets [Wed, 29 May 2013 18:41:12 +0000 (21:41 +0300)]
Fix dashboard event filter when navigate via turbolinks
Drew Blessing [Tue, 28 May 2013 23:41:15 +0000 (18:41 -0500)]
Update api docs and remove old attribute from User entity.
The API docs incorrectly referenced a few attributes associated with users. The 'blocked' attribute has been replaced with 'state'. Also, 'dark_scheme' seems to no longer be available in the User model so it should be removed from the exposed attributes in the API User entity.
Add color scheme ID to API User entity
Dmitriy Zaporozhets [Wed, 29 May 2013 10:20:13 +0000 (03:20 -0700)]
Merge pull request #4098 from pguridi/jira
Jira - Fixed Jira Issue tracker support
Dmitriy Zaporozhets [Wed, 29 May 2013 10:16:30 +0000 (13:16 +0300)]
Assign to me link on issue form
Dmitriy Zaporozhets [Wed, 29 May 2013 08:59:23 +0000 (08:59 +0000)]
Merge branch 'spelling-error' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 29 May 2013 08:57:48 +0000 (08:57 +0000)]
Merge branch 'accurate-deploy-key-message' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Wed, 29 May 2013 07:41:17 +0000 (09:41 +0200)]
Correct spelling error.
Sytse Sijbrandij [Wed, 29 May 2013 07:07:14 +0000 (09:07 +0200)]
Improve accuracy of deploy key message.
Peter LeFanu Lumsdaine [Tue, 28 May 2013 17:48:51 +0000 (14:48 -0300)]
Grammar fix in error message for blocked login (in "application_controller.rb")
Dmitriy Zaporozhets [Tue, 28 May 2013 15:59:01 +0000 (18:59 +0300)]
Unbind document scroll on page:fetch to disable endlessScroll on pages where it is not used
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...
Pedro Guridi [Mon, 27 May 2013 14:53:50 +0000 (11:53 -0300)]
Changed regex to support Jira issue numbering format
Jira issues numbering format are like: "PROJECT-1234".
Changed the regular expression to support Jira issues linking, in addition to the normal #123.
Added Jira Issue tracker configuration example
bassrock [Mon, 27 May 2013 19:30:54 +0000 (13:30 -0600)]
Update check.rake
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
Mitch Tishmack [Thu, 23 May 2013 17:52:38 +0000 (12:52 -0500)]
Apparently the gitlab Travis install has no git user.
Hackily handle this with a begin block and return a default that matches current use.
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