Dmitriy Zaporozhets
ebb560ca8d
Version 7.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 Jankovski and Dmitriy 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 Tatschner and Dmitriy Zaporozhets
c9a676f77d
Add missing color codes for line anchors, fixes #8628
2015-02-20 14:47:53 -08:00
Marcin Kulik and Dmitriy Zaporozhets
fcabff63f2
Add gitorious.org importer
2015-02-20 14:47:38 -08:00
Dmitriy Zaporozhets and Dmitriy 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
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
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 Maan and Dmitriy 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 Sijbrandij and Dmitriy 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 Maan and Dmitriy 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 Maan and Dmitriy 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
2015-02-16 22:09:54 -08:00
Marin Jankovski
b6a678ef43
Use correct shell version in update doc.
2015-02-16 20:27:58 -08:00
Marin Jankovski
317e8cfee0
Merge branch 'update-guides-7-8' into 'master'
...
Updated guides for 7.8
Updated guides fro the 7.8 release
Fixes #2009
See merge request !1531
2015-02-17 04:18:12 +00:00
Patricio Cano
d11c64a67f
Updated the installation and update guides
2015-02-16 17:51:29 -08:00
Dmitriy Zaporozhets
eceec9b1c5
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-02-16 15:09:17 -08:00
Dmitriy Zaporozhets
9eef14279f
Merge branch 'oauth-dup' into 'master'
...
Fix duplicate authorized applications
On the profile applications page, display one row per authorized app instead of one row per access token. See #1987 .
cc @sytse
See merge request !1524
2015-02-16 23:08:50 +00:00
Dmitriy Zaporozhets
9a575522d5
Merge branch 'issue-title-css' into 'master'
...
Remove top margin for issue/mr title
See merge request !1529
2015-02-16 22:16:35 +00:00
Dmitriy Zaporozhets
e38f50f0ed
Merge branch 'fix-double-note-submit' into 'master'
...
Fix double note submit
Closes #1989 .
See merge request !1527
2015-02-16 21:07:03 +00:00
Dmitriy Zaporozhets
b0a9dbdfb1
Remove top margin for issue/mr title
2015-02-16 10:14:07 -08:00
Douwe Maan
29a997cde9
Properly clear notes bindings to prevent double comments on Ctrl-Enter.
2015-02-16 18:25:57 +01:00
Job van der Voort
6fa752a8ae
Merge branch 'manual_to_source_wording' into 'master'
...
Rephrasing in documentation for manual installs
Rephrased the wording in the documentation to say "installation from source" or similar.
/cc @sytse
See merge request !1526
2015-02-16 17:14:04 +00:00
Patricio Cano
2df8a91c82
Rephrased wording in the documentation to say "installation from source" instead of "manual installation" or similar.
2015-02-16 09:10:07 -08:00
Robert Schilling
5ec8038984
Merge pull request #8805 from mavimo/patch-1
...
Fix typo in changelog
2015-02-16 10:31:25 +01:00
Marco Vito Moscaritolo
958eaba3d9
Fix typo in changelog
...
Fixed small typo in changelog file.
2015-02-16 09:48:32 +01:00
Sytse Sijbrandij
87b4135924
Subscription should be a link on its own.
2015-02-15 21:51:23 -08:00
Vinnie Okada
e0f61a59b4
Use shorter map() syntax
2015-02-15 20:50:53 -07:00
Dmitriy Zaporozhets
ec5622b1a4
Merge branch 'user-account-created-email' into 'master'
...
Only send "Account was created for you" email when created by admin.
See #1985
cc @sytse
See merge request !1517
2015-02-16 03:08:48 +00:00
