home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,246 Commits 48 Branches 340 Tags
8b39b8cd54bb73b485ee6ea7fc5d3bbfbe07cd5d
Commit Graph
22246 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan 8b39b8cd54 Merge branch 'fix/project-destroy-callbacks' into 'master' 
Fix project destroy callback

See gitlab-org/gitlab-ee!107.

See merge request !2307
 2016-01-06 13:00:50 +00:00
Douwe Maan 7884a26176 Merge branch 'import-gh-pull-requests' into 'master' 
Import GitHub Pull Requests into GitLab

Fixes #2833

See merge request !2168
 2016-01-06 12:58:32 +00:00
Douwe Maan 95b1adb339 Merge branch 'fix-notification-spec' into 'master' 
Fix notification spec

Master was broken :(

See merge request !2306
 2016-01-06 12:05:27 +00:00
Dmitriy Zaporozhets f6b61d1948 Merge branch 'rs-fix-abuse-report-url' into 'master' 
Fix the abuse report detail URL in the HTML email template

Previous URL resulted in a 404.

See merge request !2310
 2016-01-06 09:56:12 +00:00
Dmitriy Zaporozhets 797c2326c3 Merge branch 'feature/detailed-user-endpoint' of https://gitlab.com/Michi302/gitlab-ce 2016-01-06 10:51:17 +01:00
Stan Hu dec42e4201 Merge pull request #9912 from pmq20/psvr/dec15 
Ignore config/sidekiq.yml
 2016-01-05 15:59:47 -08:00
Robert Speicher 52e41dcac4 Fix the abuse report detail URL in the HTML email template 2016-01-05 18:02:12 -05:00
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
Grzegorz Bizon db2d067eec Fix project destroy callback 
See gitlab-org/gitlab-ee!107.
 2016-01-05 20:49:31 +01:00
Robert Speicher 045e8cc38c Update version check images to use SVG 2016-01-05 14:35:29 -05:00
Michi302 8393e3e04b Add missing changelog entry 2016-01-05 19:05:41 +01:00
Douglas Barbosa Alexandre e194b962d3 Update doc for importing existing GitHub projects to GitLab 2016-01-05 15:24:55 -02:00
Douglas Barbosa Alexandre 837a9065f0 Ensure that we're only importing local pull requests 2016-01-05 15:24:55 -02:00
Douglas Barbosa Alexandre 2dc74b48a3 Update CHANGELOG 2016-01-05 15:24:55 -02:00
Douglas Barbosa Alexandre 98909dd12c Generate separate comments when importing GitHub Issues into GitLab 2016-01-05 15:24:55 -02:00
Douglas Barbosa Alexandre dc72a8b305 Refactoring GithubImport::Importer 2016-01-05 15:24:55 -02:00
Douglas Barbosa Alexandre 6c846ef83d Extract methods to import comments on a GitHub Pull Request 2016-01-05 15:24:55 -02:00
Douglas Barbosa Alexandre d72b25811e Doesn't import GitHub PR where branches were no longer available 2016-01-05 15:24:55 -02:00
Douglas Barbosa Alexandre f19bf0eaa7 Import comments on the diff of a GitHub Pull Request into GitLab 2016-01-05 15:24:55 -02:00
Douglas Barbosa Alexandre 223f7f5345 Import comments on GitHub Pull Request into GitLab 2016-01-05 15:24:55 -02:00
Douglas Barbosa Alexandre 95f1fe724a Import GitHub Pull Requests into GitLab 2016-01-05 15:24:55 -02:00
Douwe Maan b541446389 Fix notification spec 2016-01-05 18:17:55 +01: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