OSDN Git Service
Marin Jankovski [Thu, 17 Oct 2013 13:41:02 +0000 (15:41 +0200)]
Add smtp settings override in smtp_settings sample file.
Dmitriy Zaporozhets [Thu, 17 Oct 2013 12:59:26 +0000 (12:59 +0000)]
Merge branch 'fix_sidekiq_process_count' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 17 Oct 2013 12:58:35 +0000 (12:58 +0000)]
Merge branch 'project_api_readme' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 17 Oct 2013 12:58:15 +0000 (12:58 +0000)]
Merge branch 'issue_tracker' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Thu, 17 Oct 2013 10:16:57 +0000 (12:16 +0200)]
Update project api doc.
Jacob Vosmaer [Thu, 17 Oct 2013 09:58:03 +0000 (11:58 +0200)]
Count sidekiq processes using String#scan
It seems there is no easy way to count pattern occurences with
String#match.
Marin Jankovski [Thu, 17 Oct 2013 09:36:23 +0000 (11:36 +0200)]
Make clearer use of the check.
Dmitriy Zaporozhets [Thu, 17 Oct 2013 09:33:39 +0000 (12:33 +0300)]
No text shadow for state-label
Dmitriy Zaporozhets [Thu, 17 Oct 2013 09:32:00 +0000 (12:32 +0300)]
Version up to beta
Dmitriy Zaporozhets [Thu, 17 Oct 2013 09:31:49 +0000 (12:31 +0300)]
Minor UI improvement for ui-box-show
Dmitriy Zaporozhets [Thu, 17 Oct 2013 09:27:09 +0000 (12:27 +0300)]
Add description to issues, projects in development fixtures
Marin Jankovski [Thu, 17 Oct 2013 08:57:58 +0000 (10:57 +0200)]
Use more descriptive name for config check.
Marin Jankovski [Thu, 17 Oct 2013 08:42:39 +0000 (10:42 +0200)]
Fallback to internal issue tracker if config is invalid.
Dmitriy Zaporozhets [Thu, 17 Oct 2013 07:52:38 +0000 (10:52 +0300)]
Speed up tests
Dmitriy Zaporozhets [Thu, 17 Oct 2013 07:01:48 +0000 (10:01 +0300)]
Order milestone due date on issues page filter
Dmitriy Zaporozhets [Thu, 17 Oct 2013 06:48:35 +0000 (09:48 +0300)]
Fix GollumWiki::CouldNotCreateWikiError during tests
Dmitriy Zaporozhets [Thu, 17 Oct 2013 06:30:44 +0000 (23:30 -0700)]
Merge pull request #5344 from amacarthur/thread-variable-fix
Fixing unsafe use of Thread.current variable :current_user
Dmitriy Zaporozhets [Thu, 17 Oct 2013 05:59:39 +0000 (22:59 -0700)]
Merge pull request #5350 from NARKOZ/patch-0
fix variable name
Dmitriy Zaporozhets [Wed, 16 Oct 2013 17:42:42 +0000 (20:42 +0300)]
Make ui-box-show more visible. Refactor some css classes
Nihad Abbasov [Wed, 16 Oct 2013 17:31:46 +0000 (22:31 +0500)]
refactor by_username_or_id
Nihad Abbasov [Wed, 16 Oct 2013 17:28:39 +0000 (22:28 +0500)]
fix variable name
Dmitriy Zaporozhets [Wed, 16 Oct 2013 17:19:25 +0000 (20:19 +0300)]
Better UX for blocked users in admin area
Dmitriy Zaporozhets [Wed, 16 Oct 2013 11:44:47 +0000 (11:44 +0000)]
Merge branch 'grep_fix' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Wed, 16 Oct 2013 11:39:09 +0000 (13:39 +0200)]
Add invert match to sidekiq match.
Dmitriy Zaporozhets [Wed, 16 Oct 2013 10:08:53 +0000 (10:08 +0000)]
Merge branch 'logrotate' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 16 Oct 2013 09:31:17 +0000 (09:31 +0000)]
Merge branch 'unicorn_rake_tasks' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 16 Oct 2013 09:30:12 +0000 (09:30 +0000)]
Merge branch 'sidekiq_admin_advice' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Wed, 16 Oct 2013 08:47:10 +0000 (10:47 +0200)]
Use `service gitlab reload` to restart sidekiq
Jacob Vosmaer [Wed, 16 Oct 2013 08:38:13 +0000 (10:38 +0200)]
Add logrotate setup to the installation guide
Dmitriy Zaporozhets [Wed, 16 Oct 2013 06:27:32 +0000 (09:27 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Angus MacArthur [Fri, 4 Oct 2013 19:11:50 +0000 (15:11 -0400)]
Fixing unsafe use of Thread.current variable :current_user
Jacob Vosmaer [Wed, 9 Oct 2013 14:45:32 +0000 (16:45 +0200)]
Move unicorn and sidekiq commands into bash script
Dmitriy Zaporozhets [Tue, 15 Oct 2013 17:20:36 +0000 (17:20 +0000)]
Merge branch '6_0_update_troubleshooting' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 15 Oct 2013 17:19:35 +0000 (17:19 +0000)]
Merge branch 'release-procedure' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 15 Oct 2013 17:19:18 +0000 (17:19 +0000)]
Merge branch 'sidekiq_workers_show' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Tue, 15 Oct 2013 13:28:53 +0000 (15:28 +0200)]
Show explanation .
Jacob Vosmaer [Tue, 15 Oct 2013 12:58:26 +0000 (14:58 +0200)]
Add troubleshooting info to 5.4-to-6.0.md
Jacob Vosmaer [Tue, 15 Oct 2013 12:44:06 +0000 (05:44 -0700)]
Merge pull request #5168 from DirkR/master
Added description for Redis connection via unix socket
Marin Jankovski [Tue, 15 Oct 2013 11:24:17 +0000 (13:24 +0200)]
Show sidekiq running processes in the background_jobs page.
Sytse Sijbrandij [Tue, 15 Oct 2013 09:51:56 +0000 (11:51 +0200)]
Add last actions to the repo as a reference.
Dmitriy Zaporozhets [Tue, 15 Oct 2013 09:32:22 +0000 (12:32 +0300)]
Remove unnecessary steps from update 6.1-6.2
Dmitriy Zaporozhets [Tue, 15 Oct 2013 09:23:25 +0000 (12:23 +0300)]
Confirm seed users
Dmitriy Zaporozhets [Tue, 15 Oct 2013 09:21:26 +0000 (09:21 +0000)]
Merge branch 'feature/confirmable' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 15 Oct 2013 08:29:22 +0000 (11:29 +0300)]
set current_user for project spec
Dmitriy Zaporozhets [Tue, 15 Oct 2013 08:19:19 +0000 (11:19 +0300)]
Show confirmation status in profile
Dmitriy Zaporozhets [Tue, 15 Oct 2013 06:59:58 +0000 (09:59 +0300)]
Oauth users and users created by admin should be confirmed immediatly
Dmitriy Zaporozhets [Wed, 9 Oct 2013 12:26:30 +0000 (15:26 +0300)]
Enable confirmable and reconfirmable modules for User
Now when you want to signup or change existing email you will be forced
to confirm that you really own this email. You get email with link to
follow in order to confirm your email address
Conflicts:
app/models/user.rb
Dmitriy Zaporozhets [Tue, 15 Oct 2013 06:25:14 +0000 (09:25 +0300)]
More entries in CHANGELOG
Dmitriy Zaporozhets [Tue, 15 Oct 2013 05:53:01 +0000 (22:53 -0700)]
Merge pull request #5337 from dpursehouse/improve-repository-import-message
Improve the repository import message
David Pursehouse [Tue, 15 Oct 2013 04:58:05 +0000 (13:58 +0900)]
Improve the repository import message
Dmitriy Zaporozhets [Mon, 14 Oct 2013 18:31:57 +0000 (18:31 +0000)]
Merge branch 'fix/relative_links_in_readme' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 14 Oct 2013 15:24:17 +0000 (15:24 +0000)]
Merge branch 'feature/api_iids' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Mon, 14 Oct 2013 13:55:44 +0000 (15:55 +0200)]
Links in Readme in tree view.
Dmitriy Zaporozhets [Mon, 14 Oct 2013 14:41:13 +0000 (14:41 +0000)]
Merge branch 'readding_group_member' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 14 Oct 2013 13:47:05 +0000 (16:47 +0300)]
Fix relative links from Help#API page
Dmitriy Zaporozhets [Mon, 14 Oct 2013 13:40:16 +0000 (16:40 +0300)]
Explain iid in API
Dmitriy Zaporozhets [Mon, 14 Oct 2013 13:39:54 +0000 (16:39 +0300)]
Extend API Issues, MergeRequets, Milestones with iid field
Marin Jankovski [Mon, 14 Oct 2013 12:27:27 +0000 (14:27 +0200)]
Update user access level when adding to group.
Dmitriy Zaporozhets [Mon, 14 Oct 2013 13:13:43 +0000 (06:13 -0700)]
Merge pull request #5305 from saymedia/master
Fix the sigil for merge request emails
Dmitriy Zaporozhets [Mon, 14 Oct 2013 11:08:41 +0000 (14:08 +0300)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 14 Oct 2013 10:48:05 +0000 (10:48 +0000)]
Merge branch 'web_hook_project_id' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 14 Oct 2013 10:27:39 +0000 (13:27 +0300)]
Remove .git from project url end redirect
Ex. redirect from
localhost/group/project.git
to
localhost/group/project
It used to prevent 404 error when follow submodule http link
like http://localhost/group/project.git
Dmitriy Zaporozhets [Mon, 14 Oct 2013 10:27:32 +0000 (13:27 +0300)]
Added links to submodules
Marin Jankovski [Mon, 14 Oct 2013 10:03:25 +0000 (12:03 +0200)]
Include project_id in webhook payload.
Dmitriy Zaporozhets [Mon, 14 Oct 2013 08:46:27 +0000 (08:46 +0000)]
Merge branch 'syshook-docs' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Mon, 14 Oct 2013 07:24:38 +0000 (09:24 +0200)]
System hooks docs links to admin area.
Dmitriy Zaporozhets [Mon, 14 Oct 2013 07:00:58 +0000 (07:00 +0000)]
Merge branch 'sidekiq_restart' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 14 Oct 2013 06:57:43 +0000 (06:57 +0000)]
Merge branch 'cookies-in-redis' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 13 Oct 2013 13:03:16 +0000 (16:03 +0300)]
Fix README detection for subdir
Dmitriy Zaporozhets [Sun, 13 Oct 2013 11:38:20 +0000 (14:38 +0300)]
Improve admin dashboard UX
Dmitriy Zaporozhets [Sun, 13 Oct 2013 11:22:40 +0000 (14:22 +0300)]
Revert "Move warning about 0 ssh keys to bottom of page"
This reverts commit
20c47923a10bfeb6dcd895adfcf05c78c696ec7f.
Dmitriy Zaporozhets [Sun, 13 Oct 2013 08:11:10 +0000 (11:11 +0300)]
Move warning about 0 ssh keys to bottom of page
Dmitriy Zaporozhets [Sun, 13 Oct 2013 08:00:51 +0000 (11:00 +0300)]
Lighter border color for ui-box. Show closed keyword for issues list
Dmitriy Zaporozhets [Sat, 12 Oct 2013 07:01:27 +0000 (10:01 +0300)]
Fix 500 error on page with submodules
Dmitriy Zaporozhets [Sat, 12 Oct 2013 05:06:19 +0000 (05:06 +0000)]
Merge branch 'fix/relative_render' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Fri, 11 Oct 2013 19:41:33 +0000 (21:41 +0200)]
Skip relative links render in help page.
Sytse Sijbrandij [Fri, 11 Oct 2013 15:54:38 +0000 (17:54 +0200)]
The cookie store is vulnerable to session replay attacks.
Dmitriy Zaporozhets [Fri, 11 Oct 2013 13:02:30 +0000 (13:02 +0000)]
Merge branch 'permission-levels' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 11 Oct 2013 13:00:05 +0000 (13:00 +0000)]
Merge branch 'relative_links_in_documentation' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Fri, 11 Oct 2013 11:44:00 +0000 (13:44 +0200)]
Test if markdown is rendered properly.
Sytse Sijbrandij [Fri, 11 Oct 2013 10:15:18 +0000 (12:15 +0200)]
Add information about admin.
Dmitriy Zaporozhets [Fri, 11 Oct 2013 09:32:38 +0000 (09:32 +0000)]
Merge branch 'wiki_backup' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 11 Oct 2013 09:32:12 +0000 (09:32 +0000)]
Merge branch 'consistent-naming-of-user-and-profile-page' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Fri, 11 Oct 2013 08:40:22 +0000 (10:40 +0200)]
Explain how group and project permissions interact.
Marin Jankovski [Fri, 11 Oct 2013 08:00:50 +0000 (10:00 +0200)]
Merge branch 'master' into relative_links_in_documentation
Dmitriy Zaporozhets [Thu, 10 Oct 2013 14:17:50 +0000 (07:17 -0700)]
Merge pull request #5253 from karlhungus/feature-api-download-archive
Feature api download archive
Dmitriy Zaporozhets [Thu, 10 Oct 2013 14:17:22 +0000 (07:17 -0700)]
Merge pull request #4736 from karlhungus/feature-create-wiki-repo-on-repo-enabled
Create a wiki when wiki_enabled:true
Jacob Vosmaer [Wed, 9 Oct 2013 15:17:04 +0000 (17:17 +0200)]
Skip rather than fail empty wikis during backup
Izaak Alpert [Mon, 7 Oct 2013 20:14:13 +0000 (16:14 -0400)]
Remove file compairson
Change-Id: Id2cae87c8cd383bc6cbcbdecf0f77c161bb82eab
Izaak Alpert [Wed, 2 Oct 2013 20:37:11 +0000 (16:37 -0400)]
Added more tests for archive api
Change-Id: I2b0752bc2593a944d42dde0ffe0ef9ce408228a5
Izaak Alpert [Wed, 2 Oct 2013 14:47:23 +0000 (10:47 -0400)]
Fix a bug where the tgz returned got encoded utf8
Conflicts:
doc/api/repositories.md
Change-Id: I7ebc39b47ff860813d9622ba6776583536e6e384
Izaak Alpert [Thu, 26 Sep 2013 20:42:49 +0000 (16:42 -0400)]
feature API call to download repo archive
defaults to HEAD
Conflicts:
spec/requests/api/repositories_spec.rb
Change-Id: Id114aca6c59d75f18e49bf9f33809a04e010bfb6
Izaak Alpert [Thu, 10 Oct 2013 13:05:59 +0000 (09:05 -0400)]
Updated missed styles
Change-Id: I05e02ff7e36e2350cdf5d2b94095ada9760a204e
Izaak Alpert [Mon, 7 Oct 2013 20:24:40 +0000 (16:24 -0400)]
Fix style issues
Change-Id: I1ffe18414b7f6eae38d7860a8e3b64a9a185273f
Izaak Alpert [Tue, 10 Sep 2013 13:57:34 +0000 (09:57 -0400)]
Brings this fix inline with updates to master
Change-Id: Ia50c3ac043b4c927ca59cbbdc2bba42f73e550e4
Izaak Alpert [Wed, 7 Aug 2013 19:45:57 +0000 (15:45 -0400)]
Create a wiki when wiki_enabled:true
Change-Id: I7aaab4b1f54fd2719a8a63d9069ddd5c59868e34
Marin Jankovski [Thu, 10 Oct 2013 13:09:12 +0000 (15:09 +0200)]
Merge branch 'master' into relative_links_in_documentation
Marin Jankovski [Thu, 10 Oct 2013 12:29:16 +0000 (14:29 +0200)]
Cover a special case.
Marin Jankovski [Thu, 10 Oct 2013 09:16:15 +0000 (11:16 +0200)]
Added comments and split the methods further.
Dmitriy Zaporozhets [Thu, 10 Oct 2013 09:14:21 +0000 (12:14 +0300)]
Remove unnecessary tag
OSDN Git Service
