OSDN Git Service
Dmitriy Zaporozhets [Fri, 24 Jan 2014 11:25:20 +0000 (11:25 +0000)]
Merge branch 'oudated-version-headers' into 'master'
Oudated Version Headers
If we don't update version numbers we should not include them since they are confusing.
Dmitriy Zaporozhets [Fri, 24 Jan 2014 11:25:03 +0000 (11:25 +0000)]
Merge branch 'release-procedure' into 'master'
Release Procedure
This should be in line with what is actually happening.
Dmitriy Zaporozhets [Fri, 24 Jan 2014 11:23:50 +0000 (11:23 +0000)]
Merge branch 'jira-integration' into 'master'
Jira Integration
dosire [Fri, 24 Jan 2014 11:12:36 +0000 (12:12 +0100)]
Need ! to embed.
dosire [Fri, 24 Jan 2014 11:12:04 +0000 (12:12 +0100)]
Embed screenshot.
dosire [Fri, 24 Jan 2014 11:09:33 +0000 (12:09 +0100)]
Jira integration documentation.
dosire [Fri, 24 Jan 2014 08:14:28 +0000 (09:14 +0100)]
Do not branch from master until release is done.
Dmitriy Zaporozhets [Fri, 24 Jan 2014 07:56:02 +0000 (23:56 -0800)]
Merge pull request #6142 from gdamjan/master
Check specifically for Unicorn in rack config.ru file
Dmitriy Zaporozhets [Fri, 24 Jan 2014 07:54:04 +0000 (23:54 -0800)]
Merge pull request #6149 from carlosparamio/assembla_hardcoded_project_name
Assembla service: Project name was hardcoded (oops)
Carlos Paramio [Fri, 24 Jan 2014 07:42:24 +0000 (08:42 +0100)]
Project name was hardcoded (oops)
Дамјан Георгиевски [Thu, 23 Jan 2014 17:24:31 +0000 (18:24 +0100)]
Check specifically for Unicorn in rack config.ru file
Don't assume that if the Rack server is not Passenger then it must be Unicorn. There are many other Rack servers in the world (uwsgi being one example that people use a lot).
The reverse check is much more logical, i.e. check explicitly for Unicorn
dosire [Thu, 23 Jan 2014 14:14:07 +0000 (15:14 +0100)]
Remove version since we don't keep it up to date.
Dmitriy Zaporozhets [Thu, 23 Jan 2014 12:58:39 +0000 (04:58 -0800)]
Merge pull request #6131 from dblessing/fix/mobile_ui_login
Enhance responsive UI for the login screen.
Dmitriy Zaporozhets [Thu, 23 Jan 2014 12:38:23 +0000 (14:38 +0200)]
Merge branch 'improve/mr_diff'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/project_fork.rb
features/steps/project/project_forked_merge_requests.rb
features/steps/project/project_issue_tracker.rb
features/steps/project/project_markdown_render.rb
features/steps/shared/project.rb
Dmitriy Zaporozhets [Thu, 23 Jan 2014 12:23:21 +0000 (14:23 +0200)]
Fix project model spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 23 Jan 2014 11:31:16 +0000 (13:31 +0200)]
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 23 Jan 2014 11:24:25 +0000 (13:24 +0200)]
Fix mr specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 23 Jan 2014 11:21:58 +0000 (13:21 +0200)]
Fix satellites specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 23 Jan 2014 11:17:31 +0000 (13:17 +0200)]
fix tests notes_on_merge_requests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 23 Jan 2014 11:05:34 +0000 (13:05 +0200)]
Fix public tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 23 Jan 2014 11:02:43 +0000 (13:02 +0200)]
Fix project team tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 23 Jan 2014 10:55:43 +0000 (12:55 +0200)]
Fix MR spinach tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 23 Jan 2014 08:13:23 +0000 (10:13 +0200)]
Version 6.5.1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 23 Jan 2014 08:08:26 +0000 (10:08 +0200)]
Fix selectbox when submit MR from fork to origin
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 23 Jan 2014 07:23:58 +0000 (09:23 +0200)]
Fix HELP layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Drew Blessing [Thu, 23 Jan 2014 01:46:01 +0000 (19:46 -0600)]
Enhance responsive UI for the login screen.
Dmitriy Zaporozhets [Wed, 22 Jan 2014 19:59:09 +0000 (21:59 +0200)]
Fix api merge request specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 19:08:19 +0000 (21:08 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 22 Jan 2014 19:04:56 +0000 (11:04 -0800)]
Merge pull request #6075 from skv-headless/remove_deprecated_finders
Remove deprecated finders
Dmitriy Zaporozhets [Wed, 22 Jan 2014 19:03:52 +0000 (21:03 +0200)]
Make changes to tests
* project_with_code -> project
* project -> ermpty_project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 18:22:20 +0000 (20:22 +0200)]
Always create merge_request_diff if MR created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 16:49:17 +0000 (16:49 +0000)]
Merge branch 'warn-against-version-managers' into 'master'
Warn Against Version Managers
Dmitriy Zaporozhets [Wed, 22 Jan 2014 16:48:46 +0000 (16:48 +0000)]
Merge branch 'ugly-reference' into 'master'
Ugly Reference
This prevents it displaying as < code > on https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md
dosire [Wed, 22 Jan 2014 16:46:40 +0000 (17:46 +0100)]
No need for code tag here.
dosire [Wed, 22 Jan 2014 16:38:36 +0000 (17:38 +0100)]
Spelling mistake and add links.
dosire [Wed, 22 Jan 2014 16:37:01 +0000 (17:37 +0100)]
Warn against RVM.
Dmitriy Zaporozhets [Wed, 22 Jan 2014 16:18:24 +0000 (16:18 +0000)]
Merge branch 'remove-github' into 'master'
Remove github specific mention of issue tracker
dosire [Wed, 22 Jan 2014 15:54:53 +0000 (16:54 +0100)]
Remove GitHub mention because we also have a GitLab issue tracker now.
Dmitriy Zaporozhets [Wed, 22 Jan 2014 15:16:01 +0000 (17:16 +0200)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into improve/mr_diff
Sytse Sijbrandij [Wed, 22 Jan 2014 15:04:27 +0000 (15:04 +0000)]
Merge branch 'doc/6-0-to-6-5' into 'master'
Replace 6.0-to-6.4.md with 6.0-to-6.5.md
Jacob Vosmaer [Wed, 22 Jan 2014 15:00:50 +0000 (16:00 +0100)]
Replace 6.0-to-6.4.md with 6.0-to-6.5.md
Dmitriy Zaporozhets [Wed, 22 Jan 2014 13:54:53 +0000 (15:54 +0200)]
Improve commit render performnace for MR show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 13:30:14 +0000 (15:30 +0200)]
Set mr_diff state to collected if diff is ok
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 13:20:40 +0000 (15:20 +0200)]
Render MR diff correctly
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 13:20:20 +0000 (15:20 +0200)]
Remove commits/diff store login from MergeRequest model
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 13:19:02 +0000 (15:19 +0200)]
MergeRequestDiff model responsoible for storing commits/diff info
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 13:17:41 +0000 (15:17 +0200)]
Improve db schema for merge request diffs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 12:22:47 +0000 (14:22 +0200)]
Create separate table to store Merge request commits/diffs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 09:18:34 +0000 (11:18 +0200)]
Add public assets to gitignore
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 09:10:01 +0000 (11:10 +0200)]
Version 6.5.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 09:08:42 +0000 (11:08 +0200)]
Use 6-5 branch in installation docs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 22 Jan 2014 09:02:16 +0000 (09:02 +0000)]
Merge branch 'remove-old-twitter' into 'master'
Remove Old Twitter
dosire [Wed, 22 Jan 2014 09:00:25 +0000 (10:00 +0100)]
Remove deprecated twitter handle.
Dmitriy Zaporozhets [Wed, 22 Jan 2014 08:19:05 +0000 (00:19 -0800)]
Merge pull request #6094 from sinm/patch-1
Updated gitlab.yaml.example's issue_closing_pattern to single quotes
Sytse Sijbrandij [Tue, 21 Jan 2014 13:56:09 +0000 (13:56 +0000)]
Merge branch 'user_principal_name' into 'master'
Explain how to use userPrincipalName as the username with AD
Jacob Vosmaer [Tue, 21 Jan 2014 12:33:29 +0000 (13:33 +0100)]
Further explain userPrincipalName settings
Dmitriy Zaporozhets [Tue, 21 Jan 2014 11:30:33 +0000 (13:30 +0200)]
Update from 6.4 to 6.5 guide
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Tue, 21 Jan 2014 10:45:46 +0000 (11:45 +0100)]
Explain how to use AD userPrincipalName for logins
Dmitriy Zaporozhets [Tue, 21 Jan 2014 10:36:50 +0000 (12:36 +0200)]
More entries to CHANGELOG. Version to rc1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 21 Jan 2014 10:27:39 +0000 (12:27 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 21 Jan 2014 10:27:21 +0000 (02:27 -0800)]
Merge pull request #5958 from brunoga/go-repository-fetch
Added support for Go's repository retrieval.
Sytse Sijbrandij [Tue, 21 Jan 2014 10:18:56 +0000 (10:18 +0000)]
Merge branch 'rephrase_ldap_check' into 'master'
Rephrase LDAP check script output
Jacob Vosmaer [Tue, 21 Jan 2014 10:05:03 +0000 (11:05 +0100)]
Rephrase LDAP check script output
The previous phrasing lead some people to believe that there is a limit
on the number of LDAP users that can sign in to a GitLab instance. That
is not the case; the limit in the check script only applies to the
diagnostic information result set, so that running `rake gitlab:check`
does not output thousands of LDAP users.
Dmitriy Zaporozhets [Tue, 21 Jan 2014 09:44:30 +0000 (09:44 +0000)]
Merge branch 'changelog-base64' into 'master'
Changelog Base64
Add O'Reilly sponsorship in CHANGELOG
Marc Radulescu [Tue, 21 Jan 2014 09:20:05 +0000 (10:20 +0100)]
add O'Reilly sponsorship in CHANGELOG
Jacob Vosmaer [Mon, 20 Jan 2014 15:04:17 +0000 (15:04 +0000)]
Merge branch 'clone-explanation' into 'master'
Explain where the memory recommendation comes from
The 250MB repo limit is caused by the git command line.
Also see MR !422
Dmitriy Zaporozhets [Mon, 20 Jan 2014 14:43:23 +0000 (06:43 -0800)]
Merge pull request #6098 from jeromedalbert/master
Rename "Website url" labels to "Website"
Dmitriy Zaporozhets [Mon, 20 Jan 2014 14:28:19 +0000 (14:28 +0000)]
Merge branch 'encouragement-during-install' into 'master'
Encouragement during install
Dmitriy Zaporozhets [Mon, 20 Jan 2014 14:27:38 +0000 (14:27 +0000)]
Merge branch 'fix/selectbox_above' into 'master'
Fix select2 css for drop above style less than a minute ago
Dmitriy Zaporozhets [Mon, 20 Jan 2014 14:13:12 +0000 (14:13 +0000)]
Merge branch 'bug/500_pagination' into 'master'
Fix 500 error on project issues and merge requests pages
Dmitriy Zaporozhets [Mon, 20 Jan 2014 13:41:18 +0000 (15:41 +0200)]
Fix select2 css for drop above style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jerome Dalbert [Mon, 20 Jan 2014 13:05:19 +0000 (13:05 +0000)]
Rename "Website url" labels to "Website"
Bruno Albuquerque [Mon, 20 Jan 2014 13:00:50 +0000 (08:00 -0500)]
Added a simple test to web_url_without_protocol.
Dmitriy Zaporozhets [Mon, 20 Jan 2014 12:42:18 +0000 (12:42 +0000)]
Merge branch 'fix/assign_to_me_link' into 'master'
Fix assign-to-me link for MergeRequest form
Dmitriy Zaporozhets [Mon, 20 Jan 2014 12:26:02 +0000 (12:26 +0000)]
Merge branch 'import-doc' into 'master'
Import Doc
dosire [Mon, 20 Jan 2014 12:24:19 +0000 (13:24 +0100)]
Explain the culprit and consequences of the 1GB memory recommendation.
Dmitriy Zaporozhets [Mon, 20 Jan 2014 12:23:06 +0000 (14:23 +0200)]
Fix assign-to-me link for MR form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 20 Jan 2014 12:16:12 +0000 (14:16 +0200)]
Dont override project_id params when use issues/mr filtering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sytse Sijbrandij [Mon, 20 Jan 2014 12:14:22 +0000 (12:14 +0000)]
Merge branch 'cloning_is_still_the_same' into 'master'
Git clone performance is still the same
Jacob Vosmaer [Mon, 20 Jan 2014 12:06:32 +0000 (13:06 +0100)]
Revert "Since the git clone code is more efficient now we do not need this warning anymore."
This reverts commit
a757c4a24f110aa25ad36dd347d499cf859e4d0d.
While it is true that Grack memory use while sending data to a client
was improved, this does not change the fact that the Git processes
running on a GitLab server will use more memory for large repositories.
Dmitriy Zaporozhets [Mon, 20 Jan 2014 12:00:50 +0000 (14:00 +0200)]
Update kaminari
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Bruno Albuquerque [Mon, 20 Jan 2014 11:26:34 +0000 (06:26 -0500)]
Change web_url_without scheme to web_url_without_protocol.
Dmitriy Zaporozhets [Mon, 20 Jan 2014 10:56:36 +0000 (12:56 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Bruno Albuquerque [Mon, 20 Jan 2014 10:45:17 +0000 (05:45 -0500)]
Move Go specific meta tag after the atom feed code.
Sytse Sijbrandij [Mon, 20 Jan 2014 10:37:15 +0000 (02:37 -0800)]
Merge pull request #6078 from sag47/irc_nicknames
Add IRC nicknames to channel admins
Sytse Sijbrandij [Mon, 20 Jan 2014 10:01:18 +0000 (10:01 +0000)]
Merge branch 'ee_update_instructions' into 'master'
Add EE checkout instructions to update docs
dosire [Mon, 20 Jan 2014 09:44:40 +0000 (10:44 +0100)]
Better wording of the import instructions.
Jacob Vosmaer [Mon, 20 Jan 2014 09:38:16 +0000 (10:38 +0100)]
Add EE checkout instructions to update docs
Dmitriy Zaporozhets [Mon, 20 Jan 2014 07:20:07 +0000 (07:20 +0000)]
Merge branch 'init.d' of /mnt/ebs/repositories/arifali1/gitlab-ce
sinm [Mon, 20 Jan 2014 04:47:19 +0000 (07:47 +0300)]
Updated gitlab.yaml.example's issue_closing_pattern to single quotes
… (misused double quotes here)
skv [Sun, 19 Jan 2014 18:55:59 +0000 (22:55 +0400)]
Remove deprecated finders
Dmitriy Zaporozhets [Sun, 19 Jan 2014 18:29:06 +0000 (10:29 -0800)]
Merge pull request #6072 from jvanbaarsen/fix-3516
Better check on the validity of emails
Dmitriy Zaporozhets [Sun, 19 Jan 2014 18:24:02 +0000 (20:24 +0200)]
Merge branch 'jeromedalbert-add_website_url_to_user'
Dmitriy Zaporozhets [Sun, 19 Jan 2014 18:23:29 +0000 (20:23 +0200)]
Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
Dmitriy Zaporozhets [Sat, 18 Jan 2014 22:12:55 +0000 (22:12 +0000)]
Merge branch 'improve/search_autocomplete' into 'master'
Improve: Search autocomplete
* fetch options via ajax
* only show options related to user input
* add limit to amount of options
Jerome Dalbert [Sat, 18 Jan 2014 19:07:00 +0000 (19:07 +0000)]
Add website url to user
dosire [Sat, 18 Jan 2014 14:34:40 +0000 (15:34 +0100)]
Update select branch to GitLab look and explain why this guide is long so people are not discouraged.
Dmitriy Zaporozhets [Sat, 18 Jan 2014 14:26:39 +0000 (16:26 +0200)]
Mention change of search autocomplete in CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 18 Jan 2014 14:22:57 +0000 (16:22 +0200)]
Case-insensetive search autocomplete for projets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 18 Jan 2014 14:06:20 +0000 (16:06 +0200)]
Prevent duplicate method names in helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
OSDN Git Service
