OSDN Git Service
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 .
Marin Jankovski [Tue, 15 Oct 2013 11:24:17 +0000 (13:24 +0200)]
Show sidekiq running processes in the background_jobs page.
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
Sytse Sijbrandij [Thu, 10 Oct 2013 08:43:24 +0000 (10:43 +0200)]
Consistent naming to make difference between clicking on profile pic and profile settings clear.
Dmitriy Zaporozhets [Thu, 10 Oct 2013 08:05:49 +0000 (11:05 +0300)]
Avoid 500 error on project page when application is close to RAM limit
Dmitriy Zaporozhets [Thu, 10 Oct 2013 07:53:49 +0000 (10:53 +0300)]
Use link_to_project helper
Dmitriy Zaporozhets [Thu, 10 Oct 2013 07:30:07 +0000 (10:30 +0300)]
Improve Profile#account page UI
Dmitriy Zaporozhets [Thu, 10 Oct 2013 04:58:17 +0000 (04:58 +0000)]
Merge branch 'refactor/profile_account' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 9 Oct 2013 16:36:51 +0000 (16:36 +0000)]
Merge branch 'feature/devise_email_async' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 9 Oct 2013 16:03:09 +0000 (19:03 +0300)]
Fix profile specs
Jacob Vosmaer [Wed, 9 Oct 2013 15:14:55 +0000 (17:14 +0200)]
Add GollumWiki#empty? method
Jacob Vosmaer [Wed, 9 Oct 2013 14:49:01 +0000 (16:49 +0200)]
Use sidekiq restart rake task in init script
Dmitriy Zaporozhets [Wed, 9 Oct 2013 14:01:04 +0000 (17:01 +0300)]
Fix spinach profile tests
Dmitriy Zaporozhets [Wed, 9 Oct 2013 13:52:03 +0000 (13:52 +0000)]
Reverted accidently removed registration module
Jacob Vosmaer [Wed, 9 Oct 2013 13:48:28 +0000 (15:48 +0200)]
Use built-in sidekiq deamonization
Jacob Vosmaer [Wed, 9 Oct 2013 13:46:00 +0000 (15:46 +0200)]
Remove duplicate log path generation
Jacob Vosmaer [Wed, 9 Oct 2013 13:44:25 +0000 (15:44 +0200)]
Always shut down sidekiq before starting
Dmitriy Zaporozhets [Wed, 9 Oct 2013 13:37:37 +0000 (16:37 +0300)]
Restyle Profile#Account page
Dmitriy Zaporozhets [Wed, 9 Oct 2013 13:37:18 +0000 (16:37 +0300)]
Move profile account to separate controller
Dmitriy Zaporozhets [Wed, 9 Oct 2013 13:17:40 +0000 (16:17 +0300)]
Separate page for password change
Dmitriy Zaporozhets [Wed, 9 Oct 2013 13:22:37 +0000 (13:22 +0000)]
Merge branch 'feature/api_remove_project' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Wed, 9 Oct 2013 13:01:02 +0000 (15:01 +0200)]
Rename method to avoid clashes.
Dmitriy Zaporozhets [Wed, 9 Oct 2013 12:25:31 +0000 (15:25 +0300)]
Send devise emails async
Dmitriy Zaporozhets [Wed, 9 Oct 2013 11:43:18 +0000 (14:43 +0300)]
API: docs for remove project
Dmitriy Zaporozhets [Wed, 9 Oct 2013 11:41:54 +0000 (14:41 +0300)]
API: specs for remove project
Dmitriy Zaporozhets [Wed, 9 Oct 2013 11:41:41 +0000 (14:41 +0300)]
API: new feature - remove project[D
Marin Jankovski [Wed, 9 Oct 2013 11:28:25 +0000 (13:28 +0200)]
Split.
Dmitriy Zaporozhets [Wed, 9 Oct 2013 11:19:38 +0000 (14:19 +0300)]
Remove test case that cause Mysql Deadlock
Dmitriy Zaporozhets [Wed, 9 Oct 2013 11:10:09 +0000 (04:10 -0700)]
Merge pull request #5291 from astratto/title_issue_trackers
Use proper titles for issues trackers
Dmitriy Zaporozhets [Wed, 9 Oct 2013 09:30:49 +0000 (12:30 +0300)]
Improve Profile settings UI
Dmitriy Zaporozhets [Wed, 9 Oct 2013 09:19:29 +0000 (02:19 -0700)]
Merge pull request #5281 from Popl7/upload_avatar_to_gitlab
avatar upload on profile page
Marin Jankovski [Wed, 9 Oct 2013 09:07:45 +0000 (11:07 +0200)]
Merge branch 'master' into relative_links_in_documentation
Stefano Tortarolo [Tue, 8 Oct 2013 14:21:40 +0000 (16:21 +0200)]
Use proper titles for issues trackers
Steven Thonus [Sun, 6 Oct 2013 18:13:56 +0000 (20:13 +0200)]
avatar upload on profile page
Dmitriy Zaporozhets [Wed, 9 Oct 2013 06:58:02 +0000 (23:58 -0700)]
Merge pull request #5278 from ZaaLabs/master
Small consistency addition for installation.md
Abe Hassan [Tue, 8 Oct 2013 18:32:26 +0000 (11:32 -0700)]
Fix the sigil for merge request emails
Dmitriy Zaporozhets [Tue, 8 Oct 2013 13:53:15 +0000 (06:53 -0700)]
Merge pull request #5290 from zzet/patch-3
Update merge requests from fork project to origin project
Marin Jankovski [Tue, 8 Oct 2013 13:38:24 +0000 (15:38 +0200)]
Match the brackets so we don't replace the regular text.
Andrew Kumanyaev [Tue, 8 Oct 2013 12:45:57 +0000 (16:45 +0400)]
Update merge requests from fork project to origin project
Fix error described in https://github.com/gitlabhq/gitlabhq/issues/5185
Marin Jankovski [Tue, 8 Oct 2013 12:21:01 +0000 (14:21 +0200)]
Check for wiki.
OSDN Git Service
