OSDN Git Service
Dmitriy Zaporozhets [Mon, 27 Jan 2014 07:36:18 +0000 (23:36 -0800)]
Merge pull request #5476 from lyda/logo-white-compress
Reduce image size.
Sytse Sijbrandij [Sun, 26 Jan 2014 21:28:07 +0000 (13:28 -0800)]
Merge pull request #6163 from Corobi/master
improve upgrader "latest version" message
Corobi [Sat, 25 Jan 2014 23:33:55 +0000 (23:33 +0000)]
improve upgrader "latest version" message
Sytse Sijbrandij [Sat, 25 Jan 2014 15:59:44 +0000 (07:59 -0800)]
Merge pull request #5907 from boomshadow/patch-1
Update installation.md with new git version
Dmitriy Zaporozhets [Sat, 25 Jan 2014 09:49:48 +0000 (09:49 +0000)]
Merge branch 'database-confusion' into 'master'
Database Confusion
To prevent https://twitter.com/TechIsCool/status/
426133762032676865
Dmitriy Zaporozhets [Sat, 25 Jan 2014 09:48:36 +0000 (11:48 +0200)]
Version to 6.6.0.pre
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 24 Jan 2014 22:01:57 +0000 (22:01 +0000)]
Merge branch 'reference_relative_links' into 'master'
Reference style links with relative links in markdown
#996
```
Adds relative links support to reference style links, eg:
[GitLab API doc directory][GitLab API directory listing]
[Maintenance][Maintenance rake task]
\[GitLab API directory listing]: doc/api/
\[Maintenance rake task]: doc/raketasks/maintenance.md
```
Dmitriy Zaporozhets [Fri, 24 Jan 2014 22:01:31 +0000 (22:01 +0000)]
Merge branch 'improve/developer_permissions' into 'master'
Permissions: Developer can manage issue tracker now
Dmitriy Zaporozhets [Fri, 24 Jan 2014 19:29:52 +0000 (21:29 +0200)]
Improve authorization for new/edit blob pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 24 Jan 2014 19:29:22 +0000 (21:29 +0200)]
Allow developers to mange issue tracker
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 24 Jan 2014 16:10:48 +0000 (16:10 +0000)]
Merge branch 'improve/mr_service' into 'master'
Improve merge request accepting logic
Add locked state to merge request during `accept` action.
Prevents mr being `triggered as merged` twice (hooks, emails etc)
Fixes #998 #729
Marin Jankovski [Fri, 24 Jan 2014 13:02:11 +0000 (14:02 +0100)]
Merge branch 'master' into reference_relative_links
Conflicts:
spec/models/project_spec.rb
Dmitriy Zaporozhets [Fri, 24 Jan 2014 12:38:02 +0000 (14:38 +0200)]
Fix mr update issue if merge_request_diff missing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 24 Jan 2014 12:18:32 +0000 (14:18 +0200)]
MergeRequests services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 24 Jan 2014 11:27:48 +0000 (11:27 +0000)]
Merge branch 'report_backup_db_success' into 'master'
Report success/failure of DB backup commands
Dmitriy Zaporozhets [Fri, 24 Jan 2014 11:27:05 +0000 (11:27 +0000)]
Merge branch 'development_seed_fix' into 'master'
Development Project Seed Data Fix
After this commit https://dev.gitlab.org/gitlab/gitlabhq/commit/
1d2bdb4d5880bb1ad39b62c81ff2971aa0cb3798 Contexts were replaced with Services. One context remained in the seed data which means development seeding will fail.
@dzaporozhets Do we want to backport this to 6.5 too?
/cc @jacobvosmaer @sytse
Dmitriy Zaporozhets [Fri, 24 Jan 2014 11:26:47 +0000 (11:26 +0000)]
Merge branch 'ssh-docs' into 'master'
Ssh Docs
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
Marin Jankovski [Thu, 23 Jan 2014 12:47:54 +0000 (13:47 +0100)]
Use the correct paths.
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
dosire [Thu, 23 Jan 2014 12:28:19 +0000 (13:28 +0100)]
Split into one sentence per line for future edits.
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>
Marin Jankovski [Thu, 23 Jan 2014 12:06:44 +0000 (13:06 +0100)]
Update last sha of the commit in the test seed repository.
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>
dosire [Thu, 23 Jan 2014 11:07:21 +0000 (12:07 +0100)]
Better ssh key docs.
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>
Jacob Vosmaer [Thu, 23 Jan 2014 10:19:43 +0000 (11:19 +0100)]
Report failure of DB backup commands
Marin Jankovski [Thu, 23 Jan 2014 10:08:57 +0000 (11:08 +0100)]
Test if the views behave correctly with reference style relative links.
Marin Jankovski [Thu, 23 Jan 2014 09:43:04 +0000 (10:43 +0100)]
Markdown helper spec for reference style relative links.
Marin Jankovski [Thu, 23 Jan 2014 09:09:19 +0000 (10:09 +0100)]
Replace context with service in development seed data.
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>
dosire [Thu, 23 Jan 2014 07:57:28 +0000 (08:57 +0100)]
Include a note for people that think the headers are wrong.
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
Marin Jankovski [Wed, 22 Jan 2014 14:07:29 +0000 (15:07 +0100)]
Display correct paths in markdown for reference style links.
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.
OSDN Git Service
