OSDN Git Service
Jacob Vosmaer [Wed, 29 Jan 2014 18:24:59 +0000 (10:24 -0800)]
Merge pull request #5842 from vikraman/patch-1
Add comment about tls for ldap method
Marin Jankovski [Wed, 29 Jan 2014 16:28:51 +0000 (17:28 +0100)]
Show images as raw and update the documentation.
Dmitriy Zaporozhets [Wed, 29 Jan 2014 15:07:15 +0000 (17:07 +0200)]
Improve issue box UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Marin Jankovski [Wed, 29 Jan 2014 14:51:07 +0000 (06:51 -0800)]
Merge pull request #6183 from Undev/fix_links_in_markdown
Fix relative links in markdown. Related to #6182
Andrey Kumanyaev [Wed, 29 Jan 2014 13:48:59 +0000 (17:48 +0400)]
Fix relative links in markdown. Related to #6182
Dmitriy Zaporozhets [Tue, 28 Jan 2014 09:53:02 +0000 (11:53 +0200)]
no raw data rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 28 Jan 2014 08:51:18 +0000 (10:51 +0200)]
Add group avatar to group page. Changed default avatar for group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 28 Jan 2014 08:26:18 +0000 (00:26 -0800)]
Merge pull request #6178 from Popl7/add_group_avatars
added group avatars
Dmitriy Zaporozhets [Tue, 28 Jan 2014 07:58:59 +0000 (07:58 +0000)]
Merge branch 'highlight-js' into 'master'
Highlight.Js
Replace pygments code highlight with client-side library - highlight.js
http://highlightjs.org/
Steven Thonus [Mon, 27 Jan 2014 21:34:05 +0000 (22:34 +0100)]
added group avatars
Sytse Sijbrandij [Tue, 28 Jan 2014 07:02:10 +0000 (07:02 +0000)]
Merge branch 'backup_crontab' into 'master'
Backup Crontab
Jacob Vosmaer [Mon, 27 Jan 2014 17:54:28 +0000 (18:54 +0100)]
Add instructions for backups using cron
Dmitriy Zaporozhets [Mon, 27 Jan 2014 16:25:11 +0000 (08:25 -0800)]
Merge pull request #6170 from skv-headless/mr_diffs_psql_broken_migrations
Fix merge_request_diffs migrations for postgresql
Dmitriy Zaporozhets [Mon, 27 Jan 2014 16:22:42 +0000 (16:22 +0000)]
Merge branch 'stash-pgrade' into 'master'
Document the stash of changes during the upgrade
Dmitriy Zaporozhets [Mon, 27 Jan 2014 16:18:18 +0000 (18:18 +0200)]
Improve highlight for notes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 27 Jan 2014 15:36:30 +0000 (17:36 +0200)]
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 27 Jan 2014 15:36:04 +0000 (15:36 +0000)]
Merge branch 'host-no-scheme' into 'master'
Host No Scheme
People keep adding http in front of the host FQDN, this comment informs them this is not needed.
https://groups.google.com/forum/#!topic/gitlabhq/HPOn51ZcQFs
Dmitriy Zaporozhets [Mon, 27 Jan 2014 15:26:18 +0000 (15:26 +0000)]
Merge branch 'merge-window' into 'master'
Merge Window
skv-headless [Mon, 27 Jan 2014 12:37:00 +0000 (16:37 +0400)]
Fix merge_request_diffs migrations for postgresql
dosire [Mon, 27 Jan 2014 13:27:47 +0000 (14:27 +0100)]
People keep adding http:// in front of the host.
dosire [Mon, 27 Jan 2014 13:16:13 +0000 (14:16 +0100)]
Detail the merge window.
dosire [Mon, 27 Jan 2014 12:51:01 +0000 (13:51 +0100)]
Explain stash.
Dmitriy Zaporozhets [Mon, 27 Jan 2014 12:44:14 +0000 (12:44 +0000)]
Merge branch 'upload-limits' into 'master'
Upload Limits
Better documentation for the upload limit. Please have a hard time when they need to change the upload limits, see https://gitlab.com/gitlab-org/gitlab-ce/issues/5
Dmitriy Zaporozhets [Mon, 27 Jan 2014 12:21:40 +0000 (14:21 +0200)]
Fix blob multiline highlight
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
dosire [Mon, 27 Jan 2014 12:01:20 +0000 (13:01 +0100)]
Reword the git explanation.
Sytse Sijbrandij [Mon, 27 Jan 2014 11:26:53 +0000 (11:26 +0000)]
Merge branch 'document_chunked_transfer' into 'master'
Document Chunked Transfer
Dmitriy Zaporozhets [Mon, 27 Jan 2014 11:12:58 +0000 (13:12 +0200)]
Add highlight.js support to markdown, snippets etc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Mon, 27 Jan 2014 10:59:15 +0000 (11:59 +0100)]
Use either/or to present options
Jacob Vosmaer [Mon, 27 Jan 2014 10:19:45 +0000 (11:19 +0100)]
Explain what we know about Nginx chunked requests
Dmitriy Zaporozhets [Mon, 27 Jan 2014 08:04:20 +0000 (08:04 +0000)]
Merge branch 'jruby' into 'master'
Recommend standard MRI implementation
Dmitriy Zaporozhets [Mon, 27 Jan 2014 07:57:36 +0000 (07:57 +0000)]
Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce
Dmitriy Zaporozhets [Mon, 27 Jan 2014 07:55:30 +0000 (07:55 +0000)]
Merge branch 'fix/test' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce
Dmitriy Zaporozhets [Mon, 27 Jan 2014 07:40:56 +0000 (09:40 +0200)]
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Dmitriy Zaporozhets [Mon, 27 Jan 2014 07:37:53 +0000 (23:37 -0800)]
Merge pull request #6158 from Razer6/remove_snippet_expiaration_date
Remove snippet expiration date from UI
Dmitriy Zaporozhets [Mon, 27 Jan 2014 07:37:37 +0000 (23:37 -0800)]
Merge pull request #6159 from dblessing/fix/mobile_ui_dashboard
Mobile UI improvements
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
Dmitriy Zaporozhets [Sun, 26 Jan 2014 20:00:23 +0000 (22:00 +0200)]
Improve themes. Load highlight.js properly
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 26 Jan 2014 19:34:22 +0000 (21:34 +0200)]
Init highlgiht js and render for blob. Improve css for it
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 26 Jan 2014 19:33:32 +0000 (21:33 +0200)]
Modify white and solarized themes for hljs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 26 Jan 2014 19:33:04 +0000 (21:33 +0200)]
Include highlight.js assets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 26 Jan 2014 19:32:31 +0000 (21:32 +0200)]
Add highlightjs assets to vendor
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sytse Sijbrandij [Sun, 26 Jan 2014 15:22:13 +0000 (15:22 +0000)]
Merge branch 'hipchat-remove-hash' of /mnt/ebs/repositories/Tenzer/gitlab-ce
Sytse Sijbrandij [Sun, 26 Jan 2014 15:21:11 +0000 (15:21 +0000)]
Merge branch 'master' of /mnt/ebs/repositories/sriharsha.vardhan/gitlab-ce
Corobi [Sat, 25 Jan 2014 23:33:55 +0000 (23:33 +0000)]
improve upgrader "latest version" message
dosire [Sat, 25 Jan 2014 16:57:18 +0000 (17:57 +0100)]
Nobody uses GitLab with Jruby.
Drew Blessing [Thu, 23 Jan 2014 02:07:01 +0000 (20:07 -0600)]
Mobile UI improvements for dashboard/nav
Style navbar toggle button
Style navbar toggle manually instead of with button classes
Style navbar
Modify color
Turn off all tooltips for touch devices
Style main nav
Fix scrolling navbar collapse
Style tweaks
Minor tweaks
Style no ssh key 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>
Robert Schilling [Sat, 25 Jan 2014 08:04:33 +0000 (09:04 +0100)]
Remove snippet expiration date from UI
Jason Hollingsworth [Sat, 25 Jan 2014 02:59:42 +0000 (20:59 -0600)]
Fix broken test in spec/models/project_spec.rb
A test was broken if running on a non-standard port.
Made checking for (non-)standard port more robust.
Changed gitlab_on_non_standard_port to gitlab_on_standard_port (less negative).
Jason Hollingsworth [Sat, 25 Jan 2014 02:06:44 +0000 (20:06 -0600)]
Add files to path blacklist.
Remove empty ErrorsController
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>
OSDN Git Service
