OSDN Git Service
Dmitriy Zaporozhets [Mon, 26 Aug 2013 13:32:15 +0000 (06:32 -0700)]
Merge pull request #4897 from rtripault/iids
[#4821] - Fix some missing iids
Dmitriy Zaporozhets [Mon, 26 Aug 2013 13:30:03 +0000 (16:30 +0300)]
Add event filter for group and project show pages
Romain [Mon, 26 Aug 2013 12:54:07 +0000 (14:54 +0200)]
[#4821] - Fix some missing iids
Dmitriy Zaporozhets [Mon, 26 Aug 2013 12:49:11 +0000 (15:49 +0300)]
Remove bottom margin for text in event note
Dmitriy Zaporozhets [Mon, 26 Aug 2013 12:09:33 +0000 (15:09 +0300)]
Fix md help table header
Dmitriy Zaporozhets [Mon, 26 Aug 2013 12:07:07 +0000 (15:07 +0300)]
Add test and docs for markdown tables
Dmitriy Zaporozhets [Mon, 26 Aug 2013 11:53:36 +0000 (14:53 +0300)]
Remove old migration tasks
You should update to 6.0 before proceed with update to higher version.
So its no reason to keep old tasks any more.
It should be still available in 6-0-stable but not in master
Dmitriy Zaporozhets [Mon, 26 Aug 2013 11:27:19 +0000 (14:27 +0300)]
Allow markdown tables
Dmitriy Zaporozhets [Mon, 26 Aug 2013 11:15:21 +0000 (14:15 +0300)]
Add redirect from Issue#id to Issue#iid
Dmitriy Zaporozhets [Mon, 26 Aug 2013 11:02:09 +0000 (04:02 -0700)]
Merge pull request #4892 from Aigeruth/feature/api-add-diff
Feature: get the diff of a commit via API.
Dmitriy Zaporozhets [Mon, 26 Aug 2013 10:50:13 +0000 (13:50 +0300)]
Better style for blockquote text in comments
Dmitriy Zaporozhets [Mon, 26 Aug 2013 10:38:27 +0000 (10:38 +0000)]
Merge branch 'userfriendly-compare-page' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 26 Aug 2013 10:37:58 +0000 (10:37 +0000)]
Add placeholders from and to
Dmitriy Zaporozhets [Mon, 26 Aug 2013 10:20:45 +0000 (13:20 +0300)]
Set iid in fixtures. Add rake dev:setup for development
Dmitriy Zaporozhets [Mon, 26 Aug 2013 10:06:41 +0000 (13:06 +0300)]
Mars theme for generated admin account
Dmitriy Zaporozhets [Mon, 26 Aug 2013 09:54:57 +0000 (12:54 +0300)]
Fix issue when developers are able to push to protected branch
When that branch contain a '/' in the branch name.
Fix for git over HTTP
Dmitriy Zaporozhets [Mon, 26 Aug 2013 09:31:57 +0000 (02:31 -0700)]
Merge pull request #4507 from smashwilson/linking-issues
Linking objects from GFM references
ash wilson [Thu, 30 May 2013 23:16:49 +0000 (23:16 +0000)]
Link issues from comments and automatically close them
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
Gabor Nagy [Sun, 25 Aug 2013 21:21:00 +0000 (23:21 +0200)]
Adds feature: get a diff via API.
Dmitriy Zaporozhets [Sun, 25 Aug 2013 19:22:04 +0000 (12:22 -0700)]
Merge pull request #4815 from MegaDiablo/patch-1
add link on realisation api for java client
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
Sytse Sijbrandij [Fri, 23 Aug 2013 13:52:49 +0000 (15:52 +0200)]
People like Karen and myself are confused by the placeholder, it seems like you don't have to change the master value. Also the to and from should be more prominent.
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
MegaDiablo [Tue, 20 Aug 2013 11:35:49 +0000 (14:35 +0300)]
add link on realisation api for java client
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