home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,378 Commits 48 Branches 340 Tags
efaa4e2386a201b889a099ae351d4eba8aa3c2f8
Commit Graph
3243 Commits
Author SHA1 Message Date
Robert Speicher af68897acd Merge branch 'api-project-upload' into 'master' 
Add API project upload endpoint

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

See merge request !2329
 2016-01-08 20:29:43 +00:00
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 0614793b38 DRY up upload and download services 2016-01-08 17:38:53 +01:00
Yorick Peterse ec4a4f0623 Merge branch 'current-settings-handle-missing-db' into 'master' 
See merge request !2346
 2016-01-08 14:09:58 +00:00
Yorick Peterse 8d7a968d6d Handle missing DBs in connect_to_db? 
This ensures CurrentSettings#connect_to_db? returns "false" in the event
of a database not existing, instead of raising an error.
 2016-01-08 14:31:39 +01:00
Robert Schilling 4c90ed52fe Delete tag via API 2016-01-08 10:10:04 +01:00
Robert Speicher b1539116f6 Merge branch 'task-list-class' into 'master' 
Properly set task-list class on single item task lists

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

See merge request !2330
 2016-01-07 20:10:07 +00: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
Douwe Maan 79938744a8 Merge branch 'master' into task-list-class 2016-01-07 15:52:58 +01:00
Douwe Maan c3865bda02 Properly set task-list class on single item task lists 2016-01-07 15:52:34 +01:00
Yorick Peterse 61561a9eeb Merge branch 'remove-more-influxdb-tags' into 'master' 
See merge request !2328
 2016-01-07 13:38:42 +00:00
Douwe Maan 706d7eb0b7 Satisfy Rubocp 2016-01-07 13:37:59 +01:00
Douwe Maan 1886d727f7 Add API project upload endpoint 2016-01-07 13:37:14 +01:00
Dmitriy Zaporozhets 3b04268f68 Merge branch 'use-sudo-with-incorrect-base-permissions' into 'master' 
Suggest prefacing find command with sudo when base permissions are wrong

Closes #5872

See merge request !2299
 2016-01-07 12:24:06 +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
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
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
Yorick Peterse ee9432a79a Merge branch 'remove-influxdb-credentials' into 'master' 
See merge request !2319
 2016-01-07 09:12:08 +00:00
Robert Speicher b93744e300 Merge branch 'merge-when-build-succeeds-unchecked' into 'master' 
Get "Merge when build succeeds" to work when commits were pushed to MR
target branch while builds were running

The Merge when build succeeds service only merges when the MR is
mergeable (open, not WIP, no conflicts).

When the target branch is updated, all affected MRs have their merge
status set to `unchecked`, and the conflicts check will only happen
when `check_if_can_be_merged` is called, which happens when the MR page
is viewed.

When someone enables the automatic merge, the target branch is updated,
no-one views the MR page again, and the build succeeds, the mergeability
check will fail and the MR will not in fact be merged.

This MR makes sure `check_if_can_be_merged` is always called when MR
mergeability is checked.

See merge request !2304
 2016-01-06 18:58:10 +00:00
Douwe Maan 6865d3e500 Merge branch 'rs-issue-1697' into 'master' 
Define a limited set of filters for SingleLinePipeline

Removes the following filters from its parent GfmPipeline:

- SyntaxHighlightFilter
- UploadLinkFilter
- TableOfContentsFilter
- LabelReferenceFilter
- TaskListFilter

Closes #1697 

See merge request !2257
 2016-01-06 18:31:28 +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 8fdc00bd4c Remove InfluxDB username/password 
InfluxDB over UDP doesn't use authentication, thus there's no need for
these settings.
 2016-01-06 17:49:56 +01: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
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 cf19efec3a Revert "Temporarily disable Markdown caching" 
This reverts commit d337d5e713.
 2016-01-06 13:26:02 +01:00
Douwe Maan b9ed3961b5 Revert "Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue." 
This reverts commit 4b027bc93a.
 2016-01-06 13:25:13 +01:00
Douwe Maan 2474a5921f Merge branch 'master' into milestone-ref 2016-01-06 13:06:50 +01:00
Douwe Maan c0849101e6 Merge branch 'master' into merge-when-build-succeeds-unchecked 2016-01-06 13:06:01 +01: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
Robert Speicher 1e6fc0c6a4 Define a limited set of filters for SingleLinePipeline 
Removes the following filters from its parent GfmPipeline:

- SyntaxHighlightFilter
- UploadLinkFilter
- TableOfContentsFilter
- LabelReferenceFilter
- TaskListFilter

Closes #1697
 2016-01-05 17:13:21 -05:00
Robert Speicher 045e8cc38c Update version check images to use SVG 2016-01-05 14:35:29 -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
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 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 097faeb481 Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running 2016-01-05 16:30:03 +01: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
Stan Hu e57b506222 Suggest prefacing find command with sudo when base permissions are wrong 
Closes #5872
 2016-01-05 05:30:01 -08: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 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
Douwe Maan 4b027bc93a Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue. 2016-01-04 14:30:30 +01:00
Yorick Peterse 2ee8f55599 Automatically prefix transaction series names 
This ensures Rails and Sidekiq transactions are split into the series
"rails_transactions" and "sidekiq_transactions" respectively.
 2016-01-04 13:17:02 +01:00
Yorick Peterse 2ea464bb27 Use separate series for Rails/Sidekiq sample stats 
This removes the need for any tags to differentiate between Sidekiq and
Rails statistics while still being able to separate the two.
 2016-01-04 12:45:31 +01:00