14156 Commits
Author SHA1 Message Date
Marin Jankovski e2d785c361 Version 7.8.1 v7.8.1 2015-02-24 13:51:48 -08:00
Dmitriy ZaporozhetsandMarin Jankovski eb4845f4f3 Fix access to attachments uploaded with 'Choose file' button for public
access
2015-02-24 12:36:17 -08:00
Dmitriy Zaporozhets b313c8f512 Merge branch '7-8-stable' of github.com:gitlabhq/gitlabhq into 7-8-stable 2015-02-23 23:30:41 -08:00
Dmitriy Zaporozhets 3c858eff0c Allow non authenticated access to avatars 2015-02-23 23:28:50 -08:00
Douwe MaanandDmitriy Zaporozhets 7257940c52 LDAP users don't need to set a password to Git over HTTP. 2015-02-23 23:28:34 -08:00
Dmitriy Zaporozhets 9b7633f10b Make services migration more reliable 2015-02-23 23:28:05 -08:00
Dmitriy ZaporozhetsandDmitriy Zaporozhets 769fe73e5b Merge branch 'bump-gitlab-shell-2-5-4' into 'master'
Bump gitlab-shell to 2.5.4

For #2042

See merge request !1584
2015-02-23 23:27:34 -08:00
Dmitriy Zaporozhets c2788e4aa9 Merge branch 'url_links_with_relative_url' into '7-8-stable'
Fix links to issues if instance is using relative urls.

Fix for https://github.com/gitlabhq/gitlabhq/issues/8767

See merge request !1574
2015-02-24 06:53:19 +00:00
Marin Jankovski 6327dd0e9d Fix links to issues if instance is using relative urls. 2015-02-23 16:40:55 -08:00
Patrik KernstockandRobert Schilling 12bdfe37da Update 7.7-to-7.8.md 2015-02-23 18:40:28 +01:00
Robert Schilling 825919aa99 Update gitlab-shell to 2.5.3 in 7-8 update guide, fixes #8838 2015-02-22 14:21:16 +01:00
Marin Jankovski bcc8dbd065 Version 7.8.0 v7.8.0 2015-02-21 21:23:15 -08:00
Marin Jankovski a75d36996e Version 7.8.0.rc6 v7.8.0.rc6 2015-02-21 19:04:01 -08:00
Marin Jankovski 556f183542 Version 7.8.0.rc5 v7.8.0.rc5 2015-02-21 10:31:58 -08:00
Marin Jankovski ec1c71d813 Merge branch '7-8-rc5' into '7-8-stable'
Changes for 7.8 RC5

See merge request !1566
2015-02-21 18:26:54 +00:00
Marin JankovskiandMarin Jankovski ccac5c96a0 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 09:53:52 -08:00
Dmitriy Zaporozhets ebb560ca8d Version 7.8.0.rc4 v7.8.0.rc4 2015-02-20 16:40:01 -08:00
Dmitriy Zaporozhets 3985798f95 Merge branch '7-8-rc4' into '7-8-stable'
Changes for 7.8.rc4

See merge request !1564
2015-02-21 00:17:59 +00:00
Marin JankovskiandDmitriy Zaporozhets dd9d17a6e3 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 14:49:07 -08:00
Stefan TatschnerandDmitriy Zaporozhets c9a676f77d Add missing color codes for line anchors, fixes #8628 2015-02-20 14:47:53 -08:00
Marcin KulikandDmitriy Zaporozhets fcabff63f2 Add gitorious.org importer 2015-02-20 14:47:38 -08:00
Dmitriy ZaporozhetsandDmitriy Zaporozhets 3360ee876a 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 14:45:26 -08:00
Dmitriy Zaporozhets b4d3f11505 Bump gitlab-shell version 2015-02-19 12:04:11 -08:00
Dmitriy Zaporozhets b5c29922c0 Version 7.8.0.rc3 v7.8.0.rc3 2015-02-19 09:45:53 -08:00
Dmitriy Zaporozhets e18d55d279 Fix trending projects ordering 2015-02-19 09:31:05 -08:00
Dmitriy Zaporozhets 6a6ffbe15b Fix user page performance and authorization
Conflicts:
	app/models/user.rb
2015-02-19 09:31:05 -08:00
Marin Jankovski 0fbf5e1300 Version 7.8.0.rc2 v7.8.0.rc2 2015-02-18 22:19:27 -08:00
Dmitriy Zaporozhets dcbe9cd3ba Merge branch '7-8-rc2' into '7-8-stable'
Code from master to 7-8-stable for RC2

See merge request !1544
2015-02-19 01:31:28 +00:00
Dmitriy Zaporozhets d2110d266c Respect star ordering on explore page 2015-02-18 16:40:45 -08:00
Douwe MaanandDmitriy Zaporozhets e9d995ba67 Fix push access check when not signed in. 2015-02-18 15:55:31 -08:00
Dmitriy Zaporozhets e0bfa89c7c Get contributed projects for last year only 2015-02-18 15:55:31 -08:00
Dmitriy Zaporozhets 4dd573b47c Improve broadcast message API 2015-02-18 15:55:31 -08:00
Dmitriy Zaporozhets 52c676f28c Dont send 404 if no broadcast messages now because it flood gitlab-shell logs with 404 errors :( 2015-02-18 15:55:31 -08:00
Dmitriy Zaporozhets 8bf7a64b5f Get contributed projects only if push event exists
Conflicts:
	app/models/user.rb
2015-02-18 15:55:28 -08:00
Sytse SijbrandijandDmitriy Zaporozhets 87bf35df95 Say unassigned instead of WIP for merge requests since it might not fit everyones workflow. 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets 81e1257071 Fix event loading with associations 2015-02-18 15:54:58 -08:00
Douwe MaanandDmitriy Zaporozhets fd5d8be109 Fix Markdown relative links to files with anchors. 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets 9ae787705f Fix MR labels css 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets 2bbc534b48 Update CHANGELOG with performance improvements 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets 56df257456 DB performance improvements to GitLab 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets 378f6a3344 Update CHANGELOG 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets dba18fa4dd Show contributed projects on user page and stars for it 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets 846c93102a Dont show gitlab.com import for gitlab.com :) 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets 5796ccd83e Remove Group#owner_id from API since it is not used any more 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets f4c81aea5d Affix assignee/milestone block 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets b8926183e4 Bump gitlab-shell version 2015-02-18 15:54:58 -08:00
Douwe MaanandDmitriy Zaporozhets 55f37e513c Make sure Markdown previews always use the same styling as the eventual destination. 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets a46754d890 Fix dev fixture for admin 2015-02-18 15:54:58 -08:00
Dmitriy Zaporozhets 4914109cb8 Fix code rendering for snippets 2015-02-18 15:53:59 -08:00
Marin Jankovski a9d9f940ce Version 7.8.0.rc1 v7.8.0.rc1 2015-02-16 22:09:54 -08:00