OSDN Git Service
Dmitriy Zaporozhets [Sun, 25 Aug 2013 19:21:22 +0000 (12:21 -0700)]
Merge pull request #4841 from Razer6/update_path_blacklist
Add 'hooks' to path blacklist.
Dmitriy Zaporozhets [Sun, 25 Aug 2013 19:21:11 +0000 (12:21 -0700)]
Merge pull request #4845 from mmoll/unicorn_localhost
bind unicorn listener to 127.0.0.1
Dmitriy Zaporozhets [Sun, 25 Aug 2013 19:20:26 +0000 (12:20 -0700)]
Merge pull request #4854 from aus/patch-1
Fix GitLab Shell version check
Dmitriy Zaporozhets [Sun, 25 Aug 2013 19:13:53 +0000 (12:13 -0700)]
Merge pull request #4879 from sugarmo/master
Select files with diff filter for graph log
Dmitriy Zaporozhets [Sun, 25 Aug 2013 18:49:06 +0000 (11:49 -0700)]
Merge pull request #4860 from gitlabhq/fix_service_gitlab_restart
Fix the `service gitlab restart` command
dsekretov [Fri, 23 Aug 2013 09:34:08 +0000 (13:34 +0400)]
Update 20130419190306_allow_merges_for_forks.rb
Postgress db migrate fails.(5.4=>6.0)
Dmitriy Zaporozhets [Sat, 24 Aug 2013 19:43:35 +0000 (22:43 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Sat, 24 Aug 2013 19:42:52 +0000 (22:42 +0300)]
Fixed 500 error when try to remove group
Steven Mok [Sat, 24 Aug 2013 03:27:08 +0000 (11:27 +0800)]
Select files with diff filter for graph log
Jacob Vosmaer [Fri, 23 Aug 2013 08:28:07 +0000 (10:28 +0200)]
Fix the `service gitlab restart` command
This commit addresses two related issues:
- Sidekiq should shut down completely before we restart it;
- If we restart unicorn with USR2 we need to kill the old master and
worker processes.
Austin Robertson [Thu, 22 Aug 2013 18:10:18 +0000 (13:10 -0500)]
Fix GitLab Shell version check
Jacob Vosmaer [Thu, 22 Aug 2013 14:04:10 +0000 (07:04 -0700)]
Merge pull request #4847 from Stayallive/patch-1
Added assets:precompile in upgrade guide 5.4 -> 6.0
Alex Bouma [Thu, 22 Aug 2013 14:00:42 +0000 (16:00 +0200)]
Added assets:precompile in upgrade guide 5.4 -> 6.0
Dmitriy Zaporozhets [Thu, 22 Aug 2013 12:45:36 +0000 (15:45 +0300)]
Show reopen milestone button if milestone was closed
Dmitriy Zaporozhets [Thu, 22 Aug 2013 12:40:48 +0000 (15:40 +0300)]
Show iids for issues/mr in email subject
Dmitriy Zaporozhets [Thu, 22 Aug 2013 11:49:57 +0000 (14:49 +0300)]
Recreate project satellite on rename or transfer
Michael Moll [Thu, 22 Aug 2013 11:17:58 +0000 (13:17 +0200)]
bind unicorn listener to 127.0.0.1
otherwise it will listen on 0.0.0.0
Dmitriy Zaporozhets [Thu, 22 Aug 2013 08:04:04 +0000 (08:04 +0000)]
Merge branch '25_000_installations' of /home/git/repositories/gitlab/gitlabhq
Robert Schilling [Thu, 22 Aug 2013 06:18:50 +0000 (08:18 +0200)]
Add 'hooks' to path blacklist.
Jacob Vosmaer [Wed, 21 Aug 2013 15:38:59 +0000 (17:38 +0200)]
Increase estimated number of GitLab installations
Dmitriy Zaporozhets [Wed, 21 Aug 2013 12:07:09 +0000 (15:07 +0300)]
Fix tests after can_create_team was removed
Dmitriy Zaporozhets [Wed, 21 Aug 2013 11:12:46 +0000 (04:12 -0700)]
Merge pull request #4826 from amouhzi/patch-1
Fix bug in ace-src-noconflict with Relative url.
Dmitriy Zaporozhets [Wed, 21 Aug 2013 11:11:52 +0000 (04:11 -0700)]
Merge pull request #4829 from hiroponz/render-not-found-when-failing-to-look-for-commit
Render not found when failing to look for commit
Hiroyuki Sato [Wed, 21 Aug 2013 10:20:29 +0000 (19:20 +0900)]
A little improvement
1. Replace params key 'q' with 'extended_sha1'. A extended SHA1 syntax is explained in 'man gitrevisions'.
2. Change the placeholder of looking for commit.
3. Change the label of ref filter.
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:40:02 +0000 (12:40 +0300)]
Add z-index to flash message
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:34:02 +0000 (12:34 +0300)]
Reannotate
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:33:12 +0000 (12:33 +0300)]
Fix accidentally removed class name
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:31:47 +0000 (12:31 +0300)]
Remove can_create_team code from user
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:22:18 +0000 (12:22 +0300)]
Look for milestone by iid in milestone controller
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:16:26 +0000 (12:16 +0300)]
Add iids to milestones. Moved iids logic to separate concern
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:09:13 +0000 (12:09 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:08:32 +0000 (12:08 +0300)]
Remove deprecated models
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:08:10 +0000 (12:08 +0300)]
Drop deprecated tables
Dmitriy Zaporozhets [Wed, 21 Aug 2013 09:04:33 +0000 (12:04 +0300)]
Warn about update to 6.1
Hiroyuki Sato [Wed, 21 Aug 2013 07:55:18 +0000 (16:55 +0900)]
Render not found when failing to look for a commit
Dmitriy Zaporozhets [Wed, 21 Aug 2013 08:37:35 +0000 (01:37 -0700)]
Merge pull request #4824 from lurdan/patch-1
fix checkout tag name
Hassan Amouhzi [Wed, 21 Aug 2013 07:13:50 +0000 (09:13 +0200)]
Fix bug in ace-src-noconflict with Relative url.
If we doesn't use a relative url we have this:
<pre>gon.relative_url_root=""</pre>
Else <pre>gon.relative_url_root="/gitlab"</pre>
Gitlab::Application.config.assets.prefix contains:
<pre>/assets</pre>
lurdan [Wed, 21 Aug 2013 02:25:46 +0000 (11:25 +0900)]
fix checkout tag name
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:41:05 +0000 (22:41 +0300)]
Fix migrate_iids for issues
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:34:14 +0000 (22:34 +0300)]
Prepare doc for update from 6.0 to 6.1
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:30:45 +0000 (22:30 +0300)]
6.1.0pre
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:30:38 +0000 (19:30 +0000)]
Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:28:19 +0000 (12:28 -0700)]
Merge pull request #4819 from croemmich/patch-1
Update to gitlab-shell 1.7.0 during 5.4-6.0 update
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:14:22 +0000 (22:14 +0300)]
Fix wrong branch in install docs
Chris Roemmich [Tue, 20 Aug 2013 19:13:49 +0000 (14:13 -0500)]
Update to gitlab-shell 1.7.0 during 5.4-6.0 update
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:12:42 +0000 (22:12 +0300)]
Fix bug in installation doc with non-install unicorn
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:10:40 +0000 (19:10 +0000)]
Merge branch 'refactor/access_roles' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:09:35 +0000 (12:09 -0700)]
Merge pull request #4812 from hiroponz/remove-dependancy-of-grit
Remove the dependancy of grit from class Network::Graph
Dmitriy Zaporozhets [Tue, 20 Aug 2013 19:05:58 +0000 (22:05 +0300)]
Time for 6.0.0
Dmitriy Zaporozhets [Tue, 20 Aug 2013 18:50:33 +0000 (21:50 +0300)]
Bold names for public projects
Dmitriy Zaporozhets [Tue, 20 Aug 2013 18:41:14 +0000 (21:41 +0300)]
Fix tests
Dmitriy Zaporozhets [Tue, 20 Aug 2013 18:31:37 +0000 (21:31 +0300)]
Render small avatars for inline events
Dmitriy Zaporozhets [Tue, 20 Aug 2013 18:20:11 +0000 (21:20 +0300)]
Fix event image preview
Dmitriy Zaporozhets [Tue, 20 Aug 2013 18:09:54 +0000 (21:09 +0300)]
Dashboard event right margin + increased padding
Dmitriy Zaporozhets [Tue, 20 Aug 2013 14:44:15 +0000 (17:44 +0300)]
Rename wiki repo if project repo was removed
Dmitriy Zaporozhets [Tue, 20 Aug 2013 14:31:26 +0000 (17:31 +0300)]
Searching for issue/mr by iid in markdown
Dmitriy Zaporozhets [Tue, 20 Aug 2013 13:56:05 +0000 (16:56 +0300)]
Fixing tests after adding iid for issues/mr
Dmitriy Zaporozhets [Tue, 20 Aug 2013 12:59:45 +0000 (15:59 +0300)]
Refactor access roles methods
Dmitriy Zaporozhets [Tue, 20 Aug 2013 12:59:26 +0000 (15:59 +0300)]
Added Gitlab::Access module
Dmitriy Zaporozhets [Tue, 20 Aug 2013 09:41:56 +0000 (12:41 +0300)]
Its time for 6.0.0rc1
Dmitriy Zaporozhets [Tue, 20 Aug 2013 09:40:51 +0000 (12:40 +0300)]
Better message for migrating global projects
Hiroyuki Sato [Tue, 20 Aug 2013 03:05:23 +0000 (12:05 +0900)]
Remove the dependancy of grit from class Network::Graph
Dmitriy Zaporozhets [Mon, 19 Aug 2013 20:22:14 +0000 (20:22 +0000)]
Merge branch 'init-script-should-restart-unicorn' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Mon, 19 Aug 2013 20:20:32 +0000 (22:20 +0200)]
Relative root needs to be changed in three places.
Sytse Sijbrandij [Mon, 19 Aug 2013 19:54:12 +0000 (21:54 +0200)]
Fix confusing situation where install guide told you to install init.d script for puma.
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:53:11 +0000 (22:53 +0300)]
Iid improvemets
* call set_iid before validation
* make rake task pass event if objects are invalid
* show iid in comment event at dashboard
Sytse Sijbrandij [Mon, 19 Aug 2013 19:49:27 +0000 (21:49 +0200)]
Configure the relative path only one time.
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:12:59 +0000 (22:12 +0300)]
Show iid in event feed and uatocomplete as default id for issues, mr
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:12:40 +0000 (22:12 +0300)]
Show iid as default id for issues, mr
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:12:04 +0000 (22:12 +0300)]
Find issues and Mr by iid in controller
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:11:18 +0000 (22:11 +0300)]
Create task to create iid for existing issues/mr
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:10:56 +0000 (22:10 +0300)]
Sett iid on create. Use iid as value to_param
Dmitriy Zaporozhets [Mon, 19 Aug 2013 19:10:21 +0000 (22:10 +0300)]
Add iid field to issues and MR
Dmitriy Zaporozhets [Mon, 19 Aug 2013 17:11:41 +0000 (20:11 +0300)]
Make repo graph work for large repos on slower machines
Dmitriy Zaporozhets [Mon, 19 Aug 2013 15:52:19 +0000 (18:52 +0300)]
its time for beta
Dmitriy Zaporozhets [Mon, 19 Aug 2013 12:42:20 +0000 (05:42 -0700)]
Merge pull request #4670 from anezi/relative-url-patch
More fixes for supporting Relative URL
Dmitriy Zaporozhets [Mon, 19 Aug 2013 10:32:31 +0000 (03:32 -0700)]
Merge pull request #4797 from mbajur/flashes-revived
Make flash messages fixed and sticked to bottom
Mike Bajur [Sat, 17 Aug 2013 14:36:44 +0000 (16:36 +0200)]
Update flash message timeout to 5 seconds
GitLab [Sat, 17 Aug 2013 10:32:59 +0000 (06:32 -0400)]
Make flash messages fixed and sticked to bottom
Dmitriy Zaporozhets [Fri, 16 Aug 2013 13:59:26 +0000 (16:59 +0300)]
Fixed wrong last-edit time for wiki
Dmitriy Zaporozhets [Fri, 16 Aug 2013 12:40:55 +0000 (15:40 +0300)]
Dont render event body if empty
Dmitriy Zaporozhets [Fri, 16 Aug 2013 12:37:42 +0000 (15:37 +0300)]
Minor UI improvements to event feed
Dmitriy Zaporozhets [Fri, 16 Aug 2013 12:28:32 +0000 (15:28 +0300)]
Reduce padding for events on dashboard
Dmitriy Zaporozhets [Fri, 16 Aug 2013 09:56:08 +0000 (09:56 +0000)]
Merge branch 'mention-unicorn' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Fri, 16 Aug 2013 09:53:52 +0000 (11:53 +0200)]
Information about teams in changelog and switching to unicorn for all people.
Sytse Sijbrandij [Fri, 16 Aug 2013 09:49:49 +0000 (11:49 +0200)]
Unix line endings.
Dmitriy Zaporozhets [Fri, 16 Aug 2013 09:39:38 +0000 (02:39 -0700)]
Merge pull request #4791 from h2s/wording
Improvements to English text
Dmitriy Zaporozhets [Thu, 15 Aug 2013 20:29:01 +0000 (13:29 -0700)]
Merge pull request #4789 from jojosch/fix-link-project-branches
Fix the link to the project branches
amouhzi [Tue, 30 Jul 2013 14:48:00 +0000 (16:48 +0200)]
Fixes grack authentification under relative_url_root
Ref: https://github.com/gitlabhq/gitlabhq/commit/
e6159b8725f99af78f446f8d33fa0e52b7780430
Ref: https://github.com/gitlabhq/gitlabhq/pull/3204
Ref: https://github.com/gitlabhq/gitlabhq/issues/1228
Add Rails' variable in application.rb to support relative url
This variable is used by assets compilation and other modules.
Note that user needs to change application.rb too
Restrict session cookie to the relative path if set.
Ref: https://github.com/gitlabhq/gitlabhq/commit/
2c2f1e31856a4decdae469974f5bea8245316f7e
Fix Update attachment_uploader.rb bug with relative URL
See: https://github.com/gitlabhq/gitlabhq/commit/
161afda3fa4fca58f396e9c3acbd72bc14490ace
Fix Wall relative bug with attachement files (javascript)
Henry Smith [Thu, 15 Aug 2013 19:06:43 +0000 (20:06 +0100)]
Another wording change in accordance with a suggestion from @karlhungus
Thanks!
Henry Smith [Thu, 15 Aug 2013 19:04:09 +0000 (20:04 +0100)]
Changing text as per the suggestion by @karlhungus
Definitely sounds better like this.
Henry Smith [Thu, 15 Aug 2013 18:31:00 +0000 (19:31 +0100)]
Improved wording for the settings in the "My Profile" section
Henry Smith [Thu, 15 Aug 2013 18:19:29 +0000 (19:19 +0100)]
Lots of wording improvements for the project settings area
Summary:
- Mostly very small things involving use of "a", "the" etc.
- "post-receive" hooks are usually written with the hyphen in the name .
- I changed the Web Hooks page to have a title consistent with all the other
pages in the settings area.
- More consistent usage of full-stops in lists.
Henry Smith [Thu, 15 Aug 2013 18:01:05 +0000 (19:01 +0100)]
A couple of small wording improvements for the merge request approval page
Henry Smith [Thu, 15 Aug 2013 17:58:22 +0000 (18:58 +0100)]
Improved wording for the "light" heading sentences for the main dashboard pages
These are just a few very particular fixes for small grammatical issues,
intended to polish the reading experience.
Henry Smith [Thu, 15 Aug 2013 17:50:17 +0000 (18:50 +0100)]
Wording improvements in the zero_authorized_projects template
I've reworded the first sentence to say "You don't have access to any projects",
which I think sounds more natural.
I've also used the "pluralize" ActionView helper for the user's projects_limit,
so that it still looks good when it says "You can create up to 1 project.".
Finally, I've tweaked the structure of the final sentence a little bit to make
it sound a bit better.
Henry Smith [Thu, 15 Aug 2013 17:31:16 +0000 (18:31 +0100)]
More specific empty state message wording
I've changed all the instances of "Nothing to show here" to specifically mention
the name of the entity of which there are none to show. This makes for a
slightly smoother reading experience.
Johannes Schleifenbaum [Thu, 15 Aug 2013 12:02:39 +0000 (14:02 +0200)]
Fix the link to the project branches
Dmitriy Zaporozhets [Thu, 15 Aug 2013 11:33:38 +0000 (14:33 +0300)]
Improve UI for Project settings page
Dmitriy Zaporozhets [Thu, 15 Aug 2013 10:24:08 +0000 (13:24 +0300)]
Use bold font at Dashboard#projects and Profile#groups