6866 Commits
Author SHA1 Message Date
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 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
Dmitriy Zaporozhets d2110d266c Respect star ordering on explore page 2015-02-18 16:40:45 -08:00
Dmitriy Zaporozhets e0bfa89c7c Get contributed projects for last year only 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 56df257456 DB performance improvements to GitLab 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 f4c81aea5d Affix assignee/milestone block 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 4914109cb8 Fix code rendering for snippets 2015-02-18 15:53:59 -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 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
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
Dmitriy Zaporozhets e0d7302b73 Merge branch 'subscription-link' into 'master'
Add links to the quick help list

Add links in the quick help list to the pricing and feature comparison pages on about.gitlab.com.  See #1969

cc @sytse

See merge request !1525
2015-02-16 03:07:47 +00:00
Dmitriy Zaporozhets 2ad00f5294 Merge branch 'tweet-new-project'
Conflicts:
	db/schema.rb
2015-02-15 19:03:10 -08:00
Vinnie Okada 9e0467c38e Fix application client count
Display the number of unique users with an access token instead of the
total number of access tokens per application in the admin area.
2015-02-15 15:53:33 -07:00
Vinnie Okada 1da7781cb3 Add items to "quick help"
Modify the quick help list to add links to the pricing and feature
comparison pages of about.gitlab.com.
2015-02-14 20:11:45 -07:00
Vinnie Okada 49d5099352 Avoid duplicate application rows
Iterate over authorized applications instead of tokens to avoid multiple
rows for the same authorized app.
2015-02-14 19:46:39 -07:00
Sytse Sijbrandij ee804e2d94 Better English in the performance diff message. 2015-02-14 12:13:31 -08:00
Douwe Maan 67afb5b145 Make sure twitter widgets are loaded when rendered through turbolinks. 2015-02-14 13:32:05 +01:00
Douwe Maan 9efb838be2 Change tweet text. 2015-02-14 13:31:46 +01:00
Dmitriy Zaporozhets f989190ed4 Show tooltips on collapsed sidebar 2015-02-13 13:36:59 -08:00
Dmitriy Zaporozhets f91767db3d Merge branch 'oauth-password-http' into 'master'
Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S)

See #1982.

![Screen Shot 2015-02-13 at 13.37.28](https://dev.gitlab.org/uploads/gitlab/gitlabhq/69fe527252/Screen_Shot_2015-02-13_at_13.37.28.png)

There's a similar tooltip for SSH: "Add an SSH key to your profile to pull or push via SSH". These are always shown on-hover, even if the persistent flash above was hidden.

cc @sytse

See merge request !1512
2015-02-13 18:12:05 +00:00
Dmitriy Zaporozhets 4d9756c1e8 Merge branch 'username-namespace-clash' into 'master'
Prevent autogenerated OAuth username to clash with existing namespace.

If the OAuth username already exists as a group rather than a user, automatic account creation would still fail.

See merge request !1511
2015-02-13 18:08:53 +00:00
Dmitriy Zaporozhets c676856f1b Merge branch 'test_settings' into 'master'
Test settings for issue tracker service

This adds minimum logging and response when using "test settings" button when the service is enabled.

See merge request !1506
2015-02-13 17:59:03 +00:00
Dmitriy Zaporozhets b8cc501c3e Merge branch 'add_tracker_integration_doc' into 'master'
Add tracker integration doc and help page on service

Added documentation on how to enable tracker integration. Fix the active link on the admin page. Added help under the JIRA service page.

See merge request !1508
2015-02-13 17:57:39 +00:00
Dmitriy Zaporozhets 917ae13bf8 Merge branch 'signin-page-headings' into 'master'
Add headings to signin/signup blocks on signin page.

See #1986

![Screen Shot 2015-02-13 at 15.17.34](https://dev.gitlab.org/uploads/gitlab/gitlabhq/4feb067a23/Screen_Shot_2015-02-13_at_15.17.34.png)

When signup is disabled, the heading for sign in only reads "Sign in", because there is no longer a choice of Existing/New user.

I've moved the OAuth signin options to just below the signin box because it looked odd as a separate box without a heading.

cc @sytse

See merge request !1516
2015-02-13 17:43:17 +00:00
Dmitriy Zaporozhets 2f9661dcd3 Merge branch 'dashboard-new-project' into 'master'
Add "New Project" button to dashboard projects page.

See merge request !1518
2015-02-13 17:41:25 +00:00
Douwe Maan 055c2f1e33 Add "New Project" button to dashboard projects page. 2015-02-13 15:43:02 +01:00
Douwe Maan 4a62a0f01a Only send "Account was created for you" email when created by admin. 2015-02-13 15:30:54 +01:00
Douwe Maan 7c39e728ef Move OAuth signin options just below signin box. 2015-02-13 15:16:17 +01:00
Douwe Maan da1608196b Add headings to signin/signup blocks on signin page. 2015-02-13 15:16:00 +01:00
Douwe Maan 25e44d0530 Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S). 2015-02-13 14:44:42 +01:00
Douwe Maan 34cc4c5982 Link head panel titles to relevant root page. 2015-02-13 14:31:51 +01:00
Douwe Maan 161d15541a Prevent autogenerated OAuth username to clash with existing namespace. 2015-02-13 12:39:11 +01:00
Douwe Maan ce08f919bf Add link to share via twitter to "created project" event. 2015-02-13 12:07:59 +01:00
Douwe Maan 9b917b4a73 Add "User created project Namespace / Project" event 2015-02-13 12:02:58 +01:00
Douwe Maan 522efa43fe Refactor event title generation for more consistent messages.
Example: "User joined project Namespace / Project" rather than "User joined project at Namespace / Project"
2015-02-13 12:02:58 +01:00