OSDN Git Service
Dmitriy Zaporozhets [Mon, 21 Oct 2013 10:06:26 +0000 (13:06 +0300)]
Improve git clone panel
Dmitriy Zaporozhets [Mon, 21 Oct 2013 10:05:52 +0000 (13:05 +0300)]
New block buttons css
Dmitriy Zaporozhets [Mon, 21 Oct 2013 10:05:20 +0000 (13:05 +0300)]
Redesign project home page
Dmitriy Zaporozhets [Mon, 21 Oct 2013 10:04:06 +0000 (13:04 +0300)]
Separate partial for project home page dropdown
Dmitriy Zaporozhets [Mon, 21 Oct 2013 07:32:05 +0000 (10:32 +0300)]
Reduce usage of bold font
Dmitriy Zaporozhets [Mon, 21 Oct 2013 07:05:13 +0000 (10:05 +0300)]
Version up to 6.2.0
Dmitriy Zaporozhets [Mon, 21 Oct 2013 06:55:41 +0000 (09:55 +0300)]
Improve project_merge_requests.rb feature steps
Dmitriy Zaporozhets [Mon, 21 Oct 2013 06:22:41 +0000 (06:22 +0000)]
Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 21 Oct 2013 05:48:14 +0000 (22:48 -0700)]
Merge pull request #5382 from nattster/patch-1
Use init.d/gitlab script from 6-0-stable branch
Natt Piyapramote [Mon, 21 Oct 2013 02:20:53 +0000 (09:20 +0700)]
Use init.d/gitlab script from 6-0-stable branch
Seems like init.d/gitlab script from master branch is not working anymore. Change to a version from 6-0-stable works fine.
It says:
```
Starting the GitLab Unicorn web server...
/etc/init.d/gitlab: 132: /etc/init.d/gitlab: script/web: not found
Starting the GitLab Sidekiq event dispatcher...
/etc/init.d/gitlab: 141: /etc/init.d/gitlab: script/background_jobs: not found
GitLab is not running.
```
Dmitriy Zaporozhets [Sun, 20 Oct 2013 15:29:11 +0000 (18:29 +0300)]
Dmitriy Zaporozhets [Sun, 20 Oct 2013 14:56:45 +0000 (07:56 -0700)]
Merge pull request #5373 from rtripault/milestone-iid
Show milestones iid instead of id
Dmitriy Zaporozhets [Sun, 20 Oct 2013 14:55:49 +0000 (17:55 +0300)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Sun, 20 Oct 2013 14:53:18 +0000 (07:53 -0700)]
Merge pull request #5377 from tsigo/autocomplete_refactor
Refactor search_autocomplete_source
Robert Speicher [Sun, 20 Oct 2013 05:05:20 +0000 (01:05 -0400)]
Refactor and cover search_autocomplete_source
Robert Speicher [Sun, 20 Oct 2013 03:57:34 +0000 (23:57 -0400)]
Cover the simple_sanitize helper
Romain [Sat, 19 Oct 2013 07:23:51 +0000 (09:23 +0200)]
A few other iids instead of ids (mostly in edit forms)
Romain [Sat, 19 Oct 2013 07:08:54 +0000 (09:08 +0200)]
Show milestones iid instead of id
Jacob Vosmaer [Fri, 18 Oct 2013 13:37:21 +0000 (06:37 -0700)]
Merge pull request #5363 from Razer6/logrote_for_update_docs
Add logrotate config to update docs
Robert Schilling [Fri, 18 Oct 2013 13:22:23 +0000 (15:22 +0200)]
Add logrotate config to update docs
Marin Jankovski [Thu, 17 Oct 2013 13:41:02 +0000 (15:41 +0200)]
Add smtp settings override in smtp_settings sample file.
Dmitriy Zaporozhets [Fri, 18 Oct 2013 07:14:39 +0000 (07:14 +0000)]
Merge branch 'project_api_readme' of /home/git/repositories/gitlab/gitlabhq
Marin Jankovski [Fri, 18 Oct 2013 07:11:37 +0000 (09:11 +0200)]
Add an example.
Dmitriy Zaporozhets [Fri, 18 Oct 2013 06:29:28 +0000 (06:29 +0000)]
Merge branch 'refactor/gitlab_config_helper' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 17 Oct 2013 19:11:41 +0000 (22:11 +0300)]
Use gitlab_config intead of Gitlab.config.gitlab in views
Sytse Sijbrandij [Tue, 8 Oct 2013 13:07:54 +0000 (15:07 +0200)]
Add warning for issue visibility.
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
OSDN Git Service
