OSDN Git Service
Dmitriy Zaporozhets [Wed, 23 Oct 2013 06:50:22 +0000 (23:50 -0700)]
Merge pull request #5340 from Undev/feature/branches_on_commit_page_pr
Show branches list (which branches contains commit) on commit page
Dmitriy Zaporozhets [Wed, 23 Oct 2013 06:47:29 +0000 (23:47 -0700)]
Merge pull request #5346 from jojosch/sidekiq-running-procs-infopage-user
Print the configured GitLab user on the Admin-Sidekiq page
Dmitriy Zaporozhets [Wed, 23 Oct 2013 06:47:12 +0000 (23:47 -0700)]
Merge pull request #5345 from jojosch/sidekiq-running-procs-infopage
Show only processes owned by the GitLab user on the Admin-Sidekiq page
Dmitriy Zaporozhets [Wed, 23 Oct 2013 06:40:48 +0000 (23:40 -0700)]
Merge pull request #5393 from anthonyryan1/master
Remove text-shadow from code blocks for all themes
Dmitriy Zaporozhets [Wed, 23 Oct 2013 06:39:30 +0000 (23:39 -0700)]
Merge pull request #5407 from inouire/master
Fix typo in sample smtp settings
Dmitriy Zaporozhets [Wed, 23 Oct 2013 06:38:46 +0000 (23:38 -0700)]
Merge pull request #5410 from Popl7/fix_max_size_shown_avatar_upload_profile
set maximum filesize for avatar on profile page correct
Dmitriy Zaporozhets [Wed, 23 Oct 2013 06:35:06 +0000 (09:35 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 23 Oct 2013 06:34:41 +0000 (06:34 +0000)]
Merge branch 'bash_3_compatibility' of /home/git/repositories/gitlab/gitlabhq
Steven Thonus [Tue, 22 Oct 2013 18:15:01 +0000 (20:15 +0200)]
set maximum filesize for avatar on profile page correct
Edouard [Tue, 22 Oct 2013 15:38:11 +0000 (17:38 +0200)]
Fix typo in sample smtp settings
Jacob Vosmaer [Tue, 22 Oct 2013 08:22:45 +0000 (10:22 +0200)]
Use `2>&1` because Bash 3 does not support `&>>`
Jacob Vosmaer [Tue, 22 Oct 2013 07:52:09 +0000 (00:52 -0700)]
Merge pull request #5392 from jvanbaarsen/patch-2
Typo fix in show.html.haml
Jacob Vosmaer [Tue, 22 Oct 2013 07:50:32 +0000 (00:50 -0700)]
Merge pull request #5391 from jvanbaarsen/patch-1
Update 6.1-to-6.2.md
Anthony Ryan [Mon, 21 Oct 2013 22:29:36 +0000 (18:29 -0400)]
Ensure that highlighted code blocks never get a text-shadow regardless of where they are or what theme is used.
Andrey Kumanyaev [Tue, 15 Oct 2013 12:59:48 +0000 (16:59 +0400)]
Show branches list (which branches contains commit) on commit page
Jeroen van Baarsen [Mon, 21 Oct 2013 18:54:18 +0000 (20:54 +0200)]
Typo fix in show.html.haml
Personl -> Personal
Jeroen van Baarsen [Mon, 21 Oct 2013 18:45:56 +0000 (20:45 +0200)]
Update 6.1-to-6.2.md
Added a few enters so markdown can process the code (without adding bash in front of it)
Jacob Vosmaer [Mon, 21 Oct 2013 14:45:09 +0000 (07:45 -0700)]
Merge pull request #5359 from dpursehouse/update-some-labels
Minor grammatical updates in some of the labels.
Dmitriy Zaporozhets [Mon, 21 Oct 2013 13:50:42 +0000 (16:50 +0300)]
Add tip to see difference between old and new config
Dmitriy Zaporozhets [Mon, 21 Oct 2013 13:16:08 +0000 (16:16 +0300)]
better align for project#home
Dmitriy Zaporozhets [Mon, 21 Oct 2013 12:37:46 +0000 (05:37 -0700)]
Merge pull request #5385 from tsigo/notification-helper-spec
Add specs for NotificationsHelper
Dmitriy Zaporozhets [Mon, 21 Oct 2013 11:53:28 +0000 (11:53 +0000)]
Merge branch 'improve/ui' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 21 Oct 2013 11:20:37 +0000 (14:20 +0300)]
Show both Private and Public labels on project show page
Dmitriy Zaporozhets [Mon, 21 Oct 2013 11:06:17 +0000 (14:06 +0300)]
Fix test
Dmitriy Zaporozhets [Mon, 21 Oct 2013 10:47:23 +0000 (13:47 +0300)]
Render right clone panel partial on empty project page
Dmitriy Zaporozhets [Mon, 21 Oct 2013 10:41:32 +0000 (13:41 +0300)]
Increase project home page margins
Dmitriy Zaporozhets [Mon, 21 Oct 2013 10:26:17 +0000 (13:26 +0300)]
Make clone links looks related to clone bar
Dmitriy Zaporozhets [Mon, 21 Oct 2013 10:07:16 +0000 (13:07 +0300)]
Update git-clone js. Use new style on wiki git access too
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 08:04:33 +0000 (08:04 +0000)]
Merge branch 'disable_rdoc' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 21 Oct 2013 07:49:30 +0000 (10:49 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 21 Oct 2013 07:32:05 +0000 (10:32 +0300)]
Reduce usage of bold font
Jacob Vosmaer [Mon, 21 Oct 2013 07:22:45 +0000 (00:22 -0700)]
Merge pull request #5380 from thestv/patch-1
corrected the url of the init-script
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
Robert Speicher [Mon, 21 Oct 2013 03:58:38 +0000 (23:58 -0400)]
Add specs for NotificationsHelper
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.
```
Stefan Baust [Sun, 20 Oct 2013 19:10:51 +0000 (21:10 +0200)]
corrected the url of the init-script
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 15:55:09 +0000 (17:55 +0200)]
Skip rdoc to speed up Ruby compilation
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
David Pursehouse [Fri, 18 Oct 2013 04:29:39 +0000 (13:29 +0900)]
Capitalise "Awesome" in placeholder text
David Pursehouse [Fri, 18 Oct 2013 04:28:49 +0000 (13:28 +0900)]
Remove "is" from labels
David Pursehouse [Fri, 18 Oct 2013 03:10:42 +0000 (12:10 +0900)]
Correct date label on project information page
The label "Created at" would be appropriate for a timestamp such
as "09:30".
However the timestamp is actually being displayed as a date in
the format "Oct 15, 2013". In this case "Created on" is better.
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
Johannes Schleifenbaum [Wed, 16 Oct 2013 07:05:52 +0000 (09:05 +0200)]
Print the configured GitLab user on the Admin-Sidekiq page
Johannes Schleifenbaum [Wed, 16 Oct 2013 07:01:31 +0000 (09:01 +0200)]
Show only processes owned by the GitLab user on the Admin-Sidekiq page
See the Pull-Request #5191
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 .
OSDN Git Service
