home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,359 Commits 48 Branches 340 Tags
7403df6ca7bd31cd002d6fcf3bf4aa02dd4478eb
Commit Graph
3683 Commits
Author SHA1 Message Date
Stan Hu 7403df6ca7 Merge branch 'suppress-allow-failure-builds' into 'master' 
Suppress e-mails on failed builds if allow_failure is set

Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about the benchmarks and others that have `allow_failure` set to `true`.

@ayufan mentioned creating a summary e-mail to prevent getting one e-mail per build, but the latter might actually be desirable. For example, I do want to know if Rubocop errors fail right away.

See merge request !2178
 2016-01-08 17:31:35 +00:00
Douwe Maan 8429f6f409 Merge branch 'rs-single-item-task-list-spec' into 'master' 
Add spec for single-item task lists

Follow-up to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2330

See merge request !2340
 2016-01-08 16:33:57 +00:00
Drew Blessing c1e974ed88 Merge branch 'issue_3076' into 'master' 
Fix problem with projects ending with .keys #3076

Closes #3076

Move route `:username.keys` below project's routes. This allow project's to handle names ending with `.keys`

See merge request !1883
 2016-01-08 15:52:05 +00:00
Dmitriy Zaporozhets b64ec38aae Merge branch 'api-delete-tag' into 'master' 
Delete tag via API

### What does this MR do?

Implements deleting a tag via the API.

### Are there points in the code the reviewer needs to double check?

On success, it returns the name of the deleted tag. This is similar to the [delete branch API](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/api/branches.rb#L111).

###  What are the relevant issue numbers / Feature requests?

* This MR closes #1575 
* Closes http://feedback.gitlab.com/forums/176466-general/suggestions/6599203-delete-tags-through-the-api

@stanhu Could you do a review?

See merge request !1862
 2016-01-08 13:47:42 +00:00
Dmitriy Zaporozhets 08213ed4f5 Merge branch 'accept-2xx-status-codes-for-webhooks' into 'master' 
Accept 2xx status codes for successful Web hook triggers

Closes https://github.com/gitlabhq/gitlabhq/issues/9956

See merge request !2332
 2016-01-08 10:56:39 +00:00
Robert Schilling 4c90ed52fe Delete tag via API 2016-01-08 10:10:04 +01:00
Robert Speicher fa36749bce Add two custom Date/Time conversion formats 2016-01-07 20:01:08 -05:00
Robert Speicher 65308a9c15 Add spec for single-item task lists 2016-01-07 15:25:39 -05:00
Robert Speicher 90510f0037 Merge branch 'milestone-ref' into 'master' 
Link to milestone in "Milestone changed" system note

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4141

See merge request !2203
 2016-01-07 19:22:43 +00:00
Stan Hu 69209612e1 Suppress e-mails on failed builds if allow_failure is set 
Every time I push to GitLab, I get > 2 emails saying a spec failed when
I don't care about benchmarks and other specs that have `allow_failure` set to `true`.
 2016-01-07 10:45:39 -08:00
Dmitriy Zaporozhets 3c93e588e9 Merge branch 'annotate-models-20160105' into 'master' 
Annotate models

Time to refresh the comments via `annotate`.


See merge request !2311
 2016-01-07 18:22:32 +00:00
Jacob Schatz 8f6ca70055 fixes ajax issue with issue spec 2016-01-07 12:27:01 -05:00
Stan Hu 8386edafd1 Accept 2xx status codes for successful Web hook triggers 
Closes https://github.com/gitlabhq/gitlabhq/issues/9956
 2016-01-07 06:28:24 -08:00
Yorick Peterse 61561a9eeb Merge branch 'remove-more-influxdb-tags' into 'master' 
See merge request !2328
 2016-01-07 13:38:42 +00:00
Yorick Peterse 7b10cb6f0f Store request methods/URIs as values 
Since filtering by these values is very rare (they're mostly just
displayed as-is) we don't need to waste any index space by saving them
as tags. By storing them as values we also greatly reduce the number of
series in InfluxDB.
 2016-01-07 13:05:00 +01:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Yorick Peterse 364b07cff0 Removed UUIDs from metrics transactions 
While useful for finding out what methods/views belong to a transaction
this might result in too much data being stored in InfluxDB.
 2016-01-07 12:44:15 +01:00
Douwe Maan 539b41929b Milestone reference is a Markdown link 2016-01-07 12:26:05 +01:00
Yorick Peterse 7ed3a5a240 Revert "Store SQL/view timings in milliseconds" 
This reverts commit 7549102bb7.

Apparently I was wrong about
ActiveSupport::Notifications::Event#duration returning the duration in
seconds, instead it returns it in milliseconds already.
 2016-01-07 11:47:06 +01:00
Robert Speicher d47b3e63d5 Merge branch 'more-opengraph' into 'master' 
Add Open Graph data for group, project and commit.

See merge request !2211
 2016-01-06 19:11:05 +00:00
Robert Speicher 623fa2caf7 Merge branch 'fix-banzai-cache' into 'master' 
Fix mentionable reference extraction caching.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4130

Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2120 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2283

See merge request !2315
 2016-01-06 18:11:46 +00:00
Yorick Peterse 7549102bb7 Store SQL/view timings in milliseconds 
Transaction timings are also already stored in milliseconds, this keeps
things consistent.
 2016-01-06 16:37:14 +01:00
Jose Corcuera 0b2fa3bfa4 Fix problem with projects ending with .keys #3076 2016-01-06 09:54:43 -05:00
Stan Hu 79c0e7212a Annotate models 2016-01-06 13:09:55 +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 18b17072c6 Add regression test. 2016-01-06 13:33:47 +01:00
Douwe Maan 2474a5921f Merge branch 'master' into milestone-ref 2016-01-06 13:06:50 +01:00
Douwe Maan 639d428046 Merge branch 'master' into more-opengraph 2016-01-06 13:06:25 +01:00
Douwe Maan 384445eca6 Don't override issue page description in project layout. 2016-01-06 13:02:51 +01:00
Robert Speicher 43053c2e6f Make page_description less magical ✨ 2016-01-05 14:54:59 -05:00
Robert Speicher a298f69432 Use User#avatar_url instead of avatar_icon helper 2016-01-05 14:50:52 -05: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 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
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 0b66151632 Remove icon from milestone reference. 2016-01-05 16:45:53 +01:00
Douwe Maan fd91b48f24 Merge branch 'master' into milestone-ref 2016-01-05 16:40:23 +01:00
Douwe Maan 7a3b762978 Merge branch 'master' into more-opengraph 
# Conflicts:
#	app/views/layouts/_head.html.haml
 2016-01-05 16:35:18 +01:00
Douwe Maan 0bab4788ef Satisfy Rubocop 2016-01-05 16:31:05 +01: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
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 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
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
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 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