home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,248 Commits 48 Branches 340 Tags
2bf0a690bfd3985b9f8f0394a8a77d3b9dde44d1
Commit Graph
14248 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrik Kernstock 2bf0a690bf Update 7.7-to-7.8.md 2015-02-22 21:39:13 +01:00
Sytse Sijbrandij ebe0d34128 Remove unreleased for 7.8 in changelog. 2015-02-22 10:52:30 -08:00
Dmitriy Zaporozhets a7f52b6cc2 Merge branch 'rails-4.1.9' into 'master' 
Upgrade to Rails 4.1.9

Upgrade the Rails gem to 4.1.9.  Rails behavior changed in version 4.1.2, requiring that we avoid using slashes in arguments to path helpers.  This MR changes routing to use nested resources for that reason.

TODO:

* [x] Make Spinach tests green
* [x] Make it mergeable

cc @sytse @dzaporozhets

See merge request !1494
 2015-02-22 18:50:28 +00:00
Dmitriy Zaporozhets 3afd91f28d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-22 10:48:38 -08:00
Vinnie Okada 5a8d8b6f20 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/projects.html.haml
 2015-02-22 07:55:30 -07:00
Robert Schilling 352115497f Merge pull request #8840 from Razer6/fix_7-8-update_guide 
Update gitlab-shell to 2.5.3 in 7-8 update guide, fixes #8838
 2015-02-22 11:53:16 +01:00
Robert Schilling 50305c363b Update gitlab-shell to 2.5.3 in 7-8 update guide, fixes #8838 2015-02-22 10:54:28 +01:00
Dmitriy Zaporozhets 44dbbb76fc Merge branch 'ui-improvements' into 'master' 
UI improvements

* filter tabs for dashboard projects page
* handle all sidebars on mobile with Aside javascript class
* remove semantic ui dependency
* fix broken sidebar for dsahboard

See merge request !1567
 2015-02-22 06:39:26 +00:00
Dmitriy Zaporozhets 87b04868a1 Create Aside js class for handling all sidebars in UI for mobile devices 2015-02-21 22:01:27 -08:00
Dmitriy Zaporozhets 52902f5434 Improve projects UI a bit 2015-02-21 18:28:32 -08:00
Vinnie Okada 64a7ecc926 Update CHANGELOG 
Move Rails 4.1.9 changes to version 7.9.
 2015-02-21 13:16:08 -07:00
Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/projects/commits/_commit.html.haml
	app/views/projects/issues/_issue.html.haml
	app/views/projects/issues/_issue_context.html.haml
	app/views/projects/merge_requests/_merge_request.html.haml
	app/views/projects/merge_requests/show/_context.html.haml
 2015-02-21 12:55:28 -07:00
Dmitriy Zaporozhets 71e146999c Render gitlab.com import block only if host is not gitlab.com 2015-02-21 11:14:17 -08:00
Marin Jankovski 829d72d30a Merge branch 'static-middleware' into 'master' 
Change check to only swap static middleware when it's enabled.

Fixes problem with #1553.

cc @marin

See merge request !1565
 2015-02-21 17:50:03 +00:00
Douwe Maan 452ba19cdd Change check to only swap static middleware when it's enabled. 2015-02-21 15:09:17 +01:00
Dmitriy Zaporozhets a224a655d8 Merge branch 'mr-commit-comment-diff-lines' into 'master' 
Fix commit comments on first line of diff not rendering in Merge Request Discussion view.

Example can be seen near the bottom on this MR: !1533.

Before:

![Screen Shot 2015-02-20 at 10.24.34](https://dev.gitlab.org/uploads/gitlab/gitlabhq/35600b98b5/Screen_Shot_2015-02-20_at_10.24.34.png)

After: the [note](https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1533/diffs#note_36449) is actually rendered.

See merge request !1552
 2015-02-21 02:06:39 +00:00
Dmitriy Zaporozhets 5484acd998 Merge branch 'empty-project-redirect-vs-404' into 'master' 
Redirect from /tree/master on empty repo instead of showing 404.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/1114

See merge request !1559
 2015-02-21 02:01:21 +00:00
Marin Jankovski 626f5bab35 Merge branch 'mattes-go-get-workaround-nginx' 2015-02-20 15:47:54 -08:00
Marin Jankovski 51349ca3c8 Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx 
Conflicts:
	lib/support/nginx/gitlab
	lib/support/nginx/gitlab-ssl
 2015-02-20 15:47:34 -08:00
Dmitriy Zaporozhets b180476bd6 Merge branch 'mr-body-single-commit' into 'master' 
Base new MR description on commit description if there's only one.

Closes #2029, again.

See merge request !1561
 2015-02-20 23:33:23 +00:00
Marin Jankovski 8ae3112b3f Merge branch 'upload-xss-access-control' into 'master' 
Fix note attachments XSS and access control

Replaces the reverted #1528, as proposed in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/434, as discussed with @dzaporozhets and as summarized in #2032.

@marin Could you take a look at the nginx config and apply it to Omnibus once this gets merged?

See merge request !1553
 2015-02-20 22:47:54 +00:00
Douwe Maan 26d57a648c Restore nginx config a little more. 2015-02-20 23:32:39 +01:00
Douwe Maan 6945f4a299 Explain Gitlab::Middleware::Static. 2015-02-20 23:30:06 +01:00
Douwe Maan 08874d2b51 Make changes to nginx config less likely to break something. 2015-02-20 23:27:17 +01:00
Dmitriy Zaporozhets acc312fc25 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-20 13:54:21 -08:00
Marin Jankovski f5888bd2e8 Merge branch 'master' into 'master' 
Added gitorious.org importer

Heavily inspired by GitHub and GitLab importers.

See merge request !343
 2015-02-20 21:52:30 +00:00
Dmitriy Zaporozhets 2617f8d14a Merge branch 'improve-web-hooks' into 'master' 
Improve web hooks

* add git_http_url and git_ssh_url to project web hook
* add visibility_level to project web hook
* add documentation about project visibility_level in API

Fixes #2018, #2030

cc @sytse

See merge request !1560
 2015-02-20 21:40:59 +00:00
Douwe Maan 0c4d27e82d Point out nginx config changes in update guides. 2015-02-20 22:36:19 +01:00
Douwe Maan 2f76ccdfac Base new MR description on commit description if there's only one. 2015-02-20 22:17:38 +01:00
Dmitriy Zaporozhets 92434b29cc Extend project web hooks with more data 
* add git_http_url and git_ssh_url to project web hook
* add visibility_level to project web hook
* add documentation about project visibility_level in API
 2015-02-20 10:27:37 -08:00
Marcin Kulik 157b4b4b1f Add gitorious.org importer 2015-02-20 17:42:58 +00:00
Dmitriy Zaporozhets 1f617c3c5f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-20 09:10:10 -08:00
Dmitriy Zaporozhets 5311de4091 Merge branch 'mr-title-single-commit' into 'master' 
Base new MR title on commit title if there's only one.

Closes #2029.

See merge request !1558
 2015-02-20 17:05:53 +00:00
Dmitriy Zaporozhets bba0b9f930 Merge branch 'commits-calendar-height' into 'master' 
Fix commits calendar vertical days.

Fixes #2031.

Before:

![Screen Shot 2015-02-20 at 14.36.31](https://dev.gitlab.org/uploads/gitlab/gitlabhq/08d322797b/Screen_Shot_2015-02-20_at_14.36.31.png)

After:

![Screen Shot 2015-02-20 at 14.35.54](https://dev.gitlab.org/uploads/gitlab/gitlabhq/0cfbabad26/Screen_Shot_2015-02-20_at_14.35.54.png)

See merge request !1555
 2015-02-20 17:01:43 +00:00
Douwe Maan 00408f37e3 Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404. 2015-02-20 17:20:03 +01:00
Douwe Maan 938a1381fc Satisfy Rubocop. 2015-02-20 16:04:03 +01:00
Douwe Maan 8830cfaa60 Base new MR title on commit title if there's only one. 2015-02-20 15:06:06 +01:00
Douwe Maan e0edea4ae9 Fix commits calendar vertical days. 2015-02-20 14:35:29 +01:00
Douwe Maan 73d12d6e6d Update changelog. 2015-02-20 13:24:51 +01:00
Douwe Maan 00ca490259 Use controllers to serve uploads, with XSS prevention and access control. 2015-02-20 13:13:48 +01:00
Douwe Maan 4310431ee7 Use modified ActionDispatch::Static to let uploads go through to routes. 2015-02-20 12:44:07 +01:00
Douwe Maan eb210f4a18 Modify nginx config to let /uploads go through to unicorn. 2015-02-20 12:22:53 +01:00
Robert Schilling 5640445108 Merge pull request #8828 from j0k3r/patch-1 
Update CHANGELOG
 2015-02-20 11:16:50 +01:00
Jeremy 7ce664c88e Update CHANGELOG 
Add myself to the changelog for the Asana service #8580
 2015-02-20 10:47:01 +01:00
Douwe Maan 0632e85c82 Fix commit comments on first line of diff not rendering in Merge Request Discussion view. 2015-02-20 10:23:34 +01:00
Dmitriy Zaporozhets 6b0199ffc1 Merge branch 'ui-improvements' into 'master' 
UI improvements

* lighter color for comments count
* better UI for issue assigee.milestone block

See merge request !1551
 2015-02-20 08:36:28 +00:00
Dmitriy Zaporozhets 675f595406 Bigger and bold title for issue/mr show pages 2015-02-20 00:20:17 -08:00
Dmitriy Zaporozhets 50df9a7cb9 Minor css improvements 
* lighter color for comments count
* better UI for issue assigee.milestone block
 2015-02-20 00:11:25 -08:00
Dmitriy Zaporozhets abc65bbbf3 Improve sidebar navigation UI for mobile devices 2015-02-19 23:18:21 -08:00
Dmitriy Zaporozhets 74ccfa8f79 Remove overflow-y style that cause overflow-x strange behaviour on mac 2015-02-19 23:05:40 -08:00