Commit Graph
22224 Commits
Author SHA1 Message Date
Robert Speicher d453b24aca Merge branch 'validate-readme-format' into 'master'
Validate README format

Take the first previewable README file as project's README, otherwise if
none file is available, or we can't preview any of them, we assume that
project doesn't have a README file.

Fixes #3978
2016-01-05 17:03:24 -05:00
Robert Speicher 67a927ff8b Merge branch 'rs-version-check-svg' into 'master'
Update version check images to use SVG

See merge request !2244
2016-01-05 20:27:40 +00:00
Robert Speicher 045e8cc38c Update version check images to use SVG 2016-01-05 14:35:29 -05:00
Douwe Maan 8de1f7159c Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master'
Better support for referencing and closing issues in asana_service.rb (by @mikew1)



See merge request !2302
2016-01-05 16:10:16 +00:00
Douwe Maan 07c39c9976 Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master'
Add graphs of commits ahead/behind default branch (by @brunsa2)

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716

See merge request !2301
2016-01-05 15:44:22 +00:00
Douwe Maan 0bab4788ef Satisfy Rubocop 2016-01-05 16:31:05 +01:00
Douwe Maan 7c3c901ada Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master'
Show 'New Merge Request' buttons on canonical repo. (by @joshfng)

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2189 to run tests on our runners.

See merge request !2300
2016-01-05 15:12:35 +00:00
Douwe Maan 9b1270280a Merge branch 'rs-abuse-reports-refactor' into 'master'
Abuse Report refactors

- Redirect back to user profile after report
- "Tell, Don't Ask" for sending report notifications

See merge request !2293
2016-01-05 14:11:15 +00:00
Douwe Maan 2479af4d5a Merge branch 'pr-9938' into 'master'
Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification

Hotfix note mail with notification

See merge request !2288
2016-01-05 14:00:13 +00:00
Douwe Maan a7c424515c Merge branch 'rs-relative-links-to-root' into 'master'
Support a single directory traversal in RelativeLinkFilter

Prior, if we were viewing a blob at
`https://example.com/namespace/project/blob/master/doc/some-file.md` and
it contained a relative link such as `[README](../README.md)`, the
resulting link when viewing the blob would be:
`https://example.com/namespace/project/blob/README.md` which omits the
`master` ref, resulting in a 404.

Fixes https://gitlab.com/gitlab-org/release-tools/issues/3

See merge request !2247
2016-01-05 13:32:25 +00:00
Douglas Barbosa Alexandre 8e33ec1dee [ci skip] Update CHANGELOG 2016-01-05 11:30:30 -02:00
Douglas Barbosa Alexandre 6ce01ca3ec Validate README format before displaying
Take the first previewable README file as project’s README, otherwise
if none file is available, or we can’t preview any of them, we assume
that project doesn’t have a README file.
2016-01-05 11:06:18 -02:00
Hannes Rosenögger 2459d51633 Merge branch 'ssh-doc-fixes' into 'master'
Help "SSH" fixes

A user was confused why ssh login did not work because he had used a nonstandard name during the key generation step. Maybe this will make it clearer.

See merge request !2296
2016-01-05 12:28:11 +00:00
Felix Eckhofer 766a59630f Fix grammar 2016-01-05 13:06:23 +01:00
Felix Eckhofer ca8639a466 Clarify the key generation step
Users must not change the default filename or they will have to create a
suitable .ssh/config which is out-of-scope here.
2016-01-05 13:06:08 +01:00
Felix Eckhofer d17945bb4e Remove misleading ssh-dsa
The keytype field is actually `ssh-dss` for DSA keys and they will not
be stored as `id_rsa.pub`.

Note that newer version of ssh actually also support
`ecdsa-sha2-nistp256` and others so it is also misleading to assume the
field always starts with `ssh-`.
2016-01-05 13:04:49 +01:00
Dmitriy Zaporozhets a31d2f2a71 Merge branch 'new-markdown' into 'master'
markdown fixes

old
![Screenshot_2016-01-05_10.49.46](/uploads/731f0e83ceefa74650ea27f8dca67b35/Screenshot_2016-01-05_10.49.46.png)

new
![Screenshot_2016-01-05_10.51.51](/uploads/85a82b2a589f9a4ad3dd47c6de3b89d7/Screenshot_2016-01-05_10.51.51.png)


See merge request !2295
2016-01-05 11:48:29 +00:00
Andriy Dyadyura 00e8532d89 markdown fixes 2016-01-05 10:51:59 +01:00
Andriy Dyadyura f7ba38c073 markdown fixes 2016-01-05 10:45:18 +01:00
Dmitriy Zaporozhets aa3c7219e3 Merge branch 'fix-api-lookup-with-usernames-with-dots' of https://gitlab.com/stanhu/gitlab-ce 2016-01-05 10:43:29 +01:00
Dmitriy Zaporozhets 7f2127ee4c Merge remote-tracking branch 'origin/crosslink-env-docs'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-05 10:36:35 +01:00
Dmitriy Zaporozhets e6713cd945 Merge branch 'improved-leave-project' into 'master'
Adds settings menu to the top for editting and leaving projects

@creamzy @skyruler @dzaporozhets 
Menu contents depends on user's rights.

Fixes #4221


![Screen_Shot_2015-12-23_at_10.02.47_PM](/uploads/daeaef937bf9d9f4db7ccb674e344ac1/Screen_Shot_2015-12-23_at_10.02.47_PM.png)
![Screen_Shot_2015-12-23_at_10.02.41_PM](/uploads/58eb4eea7d640f01d7f05c2a408a2c04/Screen_Shot_2015-12-23_at_10.02.41_PM.png)
![Screen_Shot_2015-12-23_at_10.02.55_PM](/uploads/4b2ae027a13efcbad3eb81b04f134c4f/Screen_Shot_2015-12-23_at_10.02.55_PM.png)
![Screen_Shot_2015-12-23_at_10.04.47_PM](/uploads/bd5d9d8ddd72d16d74c32c6c1f569776/Screen_Shot_2015-12-23_at_10.04.47_PM.png)


See merge request !2195
2016-01-05 09:34:13 +00:00
Dmitriy Zaporozhets 9914893954 Merge branch 'metrics-tuning' into 'master'
Tuning of metrics data to store

This removes data we don't really need, as well as making sure we don't overload any cache stores or databases.

See merge request !2265
2016-01-05 09:32:19 +00:00
Dmitriy Zaporozhets 525f8fb4fb Merge branch 'rs-logo-animation' into 'master'
Use the logo as a loading indicator

![logo-sweep](/uploads/ff048fd2e56a6dcae8801f998b484623/logo-sweep.gif)

See merge request !2277
2016-01-05 09:30:09 +00:00
Dmitriy Zaporozhets b779111dfd Merge branch 'dedupe-notifications-watcher-and-subscriber' into 'master'
Don't notify users twice if they are both project watchers and subscribers

Closes #4708

See merge request !2290
2016-01-05 09:29:06 +00:00
Dmitriy Zaporozhets 53d6bca806 Merge branch 'rs-remove-jquery-blockui' into 'master'
Remove jquery.blockUI.js plugin

It was only used to block the issue (but not merge request) list when
the sort was changed.

See merge request !2287
2016-01-05 09:28:31 +00:00
Dmitriy Zaporozhets b079e1657a Merge branch 'rs-abuse-reports' into 'master'
Redesign the AbuseReports index

- User profile links go to the admin area
- Shows when the reported user joined
- Show relative timestamp for when the report was created
- Parse message with restricted Markdown pipeline to autolink URLs

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/4667

See merge request !2292
2016-01-05 09:27:18 +00:00
Robert Speicher 46a220ae3c Add AbuseReport#notify
Tell, Don't Ask.
2016-01-04 18:59:42 -05:00
Robert Speicher 01248d2051 Make AbuseReportMailer responsible for knowing if it should deliver 2016-01-04 18:59:25 -05:00
Robert Speicher 0e60282e36 Redirect back to user profile page after abuse report
Now the reporter will see the fruits of their labor, namely, the red
icon!
2016-01-04 18:46:43 -05:00
Robert Speicher b807a23b4b Redesign the AbuseReports index
- Shows when the reported user joined
- Show relative timestamp for when the report was created
- Parse message with restricted Markdown pipeline to autolink URLs
2016-01-04 18:36:38 -05:00
Stan Hu 93096247d8 Don't notify users twice if they are both project watchers and subscribers
Closes #4708
2016-01-04 15:01:52 -08:00
Robert Speicher 567d87d90f Restructure logo JS to use setInterval 2016-01-04 15:32:05 -05:00
Robert Speicher 9f46ca4443 Decrease the logo sweep delay 2016-01-04 14:57:11 -05:00
Robert Speicher 7df3c1e8ea Correct the logo ID names
Her left, not ours!
2016-01-04 14:54:56 -05:00
Robert Speicher 6f4ea679d9 Merge branch 'show-all-builds-by-default' into 'master'
Show all builds by default in the builds page

Fixes #4240 

See merge request !2243
2016-01-04 18:42:37 +00:00
Robert Speicher 10a9751ace Update CHANGELOG
[ci skip]
2016-01-04 13:41:43 -05:00
Douwe MaanandRobert Speicher 12ce1cbfcf Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification
Hotfix note mail with notification
2016-01-04 13:33:58 -05:00
Robert Speicher ce4c38b35c Merge branch 'debug-banzai-cache' into 'master'
Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/4130#note_3012511

See merge request !2283
2016-01-04 18:20:58 +00:00
Robert Speicher ad42441d2d Remove jquery.blockUI.js plugin
It was only used to block the issue (but not merge request) list when
the sort was changed.
2016-01-04 13:12:29 -05:00
Dmitriy Zaporozhets e586492e48 Merge branch 'rs-issue-201' into 'master'
Prevent duplicate "username has already been taken" validation message

Closes #201 - two-year-old bug, woo! 💥 🎉

See merge request !2279
2016-01-04 17:20:38 +00:00
Dmitriy Zaporozhets 7e034a7f72 Merge branch 'reverting-rs-remove-jquery-blockui' into 'master'
Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'"

This reverts commit bc12750fcc, reversing
changes made to 8a04b84e09.

See merge request !2285
2016-01-04 17:19:47 +00:00
Stan Hu 561acdebf8 Merge branch 'extra-system-hooks' into 'master'
Added system hooks messages for renaming and transferring a project

This is work in progress but I wanted to get some feedback on it in case there is something I've missed or a better way to do it.

As the title says when a project is renamed or transferred to another group a system hook message is generated.

Currently adds a couple of extra properties to the standard project system hooks messages.

old_path_with_namespace - The old path of the project so we can see what has been renamed / transferred
changed_at - The time that change took place

My main concern is if there is a better way of doing this than passing the extra_data variable into the system hook.  Would it be better to extend the project model with these 2 items as transient properties as I doubt they would need to be saved to the database?  The other 

I've also seen, but can't find, someone talking about the emails sent when a project is renamed or transferred doesn't reference the original project path so if you have similarly named projects then you might not know what has been moved.  I think the extra_data (or however it is best to implement this) would allow the extra information to be sent in emails.

Closes [System hooks for project transfer and repository rename](http://feedback.gitlab.com/forums/176466-general/suggestions/6006233-system-hooks-for-project-transfer-and-repository-r)


See merge request !611
2016-01-04 15:39:52 +00:00
Jacob Schatz 6180560318 rempves tests for "you have master access" text 2016-01-04 10:36:53 -05:00
Mike Wyatt bb6b793c55 Don't log backtrace in Asana service 2016-01-04 11:19:39 -04:00
Valery Sizov 01e1b6bd93 Merge branch 'namespace-clean_up' into 'master'
Remove public field from namespace

https://gitlab.com/gitlab-org/gitlab-ce/issues/3580

See merge request !2222
2016-01-04 14:52:59 +00:00
Jacob Schatz 770517d3e7 Revert "Merge branch 'rs-remove-jquery-blockui' into 'master' "
This reverts commit bc12750fcc, reversing
changes made to 8a04b84e09.
2016-01-04 09:42:10 -05:00
Jacob Schatz 712af98e9c removes footer message about access to project 2016-01-04 09:07:50 -05:00
Valery Sizov 8b18449125 remove public field from namespace and refactoring 2016-01-04 16:00:29 +02:00
Steve Norman 79ec7f2897 Added system hooks messages for renaming and transferring a project 2016-01-04 13:48:00 +00:00