Commit Graph
3915 Commits
Author SHA1 Message Date
Josh Frye f3d4f2eac7 Fix Rubocop error 2016-01-28 14:44:45 -05:00
Josh Frye c95bc65519 Update tests 2016-01-28 13:04:42 -05:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master'
Show list of forks for a given Project

Closes #2406

See merge request !2376
2016-01-28 16:58:38 +00:00
Dmitriy Zaporozhets dfb8803c1c Improve consistency and duplication for Merge Request API
* Follow REST for merge request API route
* Remove repeating comments API for MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-28 14:26:12 +01:00
Douwe Maan f025f80d5c Merge branch 'update-ruby-2.2.4' into 'master'
Update Ruby version to 2.2.4 (latest previous stable) and update docs

Tests and issues added to https://github.com/gitlabhq/gitlabhq/issues/8696 were all fine after the upgrade. 

Main issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/3340

See merge request !2534
2016-01-27 21:39:08 +00:00
Robert Speicher bba7e786a6 Merge branch 'events-performance' into 'master'
Improve performance of retrieving last update times for events

See 75195eefcca4cb3961986c90c8e837da02f30134 and
https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317
for the juicy details.

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415

See merge request !2613
2016-01-27 21:20:16 +00:00
Robert Speicher 40403c78ef Merge branch 'fix-ci-runners-version-update' into 'master'
Fix CI runner version not being properly updated when asked for a build

Due to broken implementation of attribute_for_keys the runner information was not updated correctly.

This MR adds test to check that such scenario will never happen again.

See merge request !2618
2016-01-27 20:50:24 +00:00
Dmitriy Zaporozhets 7e6da7b91a Merge branch 'rs-2fa-requirement-wording' into 'master'
Update wording for 2FA requirement notice



See merge request !2582
2016-01-27 19:04:44 +00:00
James Lopez 683770f35d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4 2016-01-27 15:42:35 +01:00
Kamil Trzcinski 95d2f0fb51 Fix CI runner version not being properly updated when asking for a build
Due to broken implementation of attribute_for_keys the runner information was not updated correctly.

This MR adds test to check that such scenario will never happen again.
2016-01-27 12:04:54 +01:00
Yorick Peterse de7c9c7ab1 Use Atom update times of the first event
By simply loading the first event from the already sorted set we save
ourselves extra (slow) queries just to get the latest update timestamp.
This removes the need for Event.latest_update_time and significantly
reduces the time needed to build an Atom feed.

Fixes gitlab-org/gitlab-ce#12415
2016-01-27 10:33:33 +01:00
Kamil Trzciński 5e0ee54c6c Merge branch 'fix/commit-status-artifacts' into 'master'
Use generic method to checks if artifacts are available

Closes #12626

See merge request !2576
2016-01-27 09:07:47 +00:00
Blake Hitchcock 4be65c3231 Update ExternalIssue regex for JIRA integration
The pattern in the `::reference_pattern` class method in the
ExternalIssue model does not match all valid forms of JIRA project
names. I have updated the regex to match JIRA project names with numbers
and underscores. More information on valid JIRA project names can be
found here:
https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html

* The first character must be a letter,
* All letters used in the project key must be from the Modern Roman Alphabet and upper case, and
* Only letters, numbers or the underscore character can be used.
2016-01-26 15:55:40 -05:00
Grzegorz Bizon 9661765127 Update commit status factory to reflect recent changes 2016-01-26 15:23:57 +01:00
Douwe Maan b6eb416389 Merge branch 'track-project-import-failure' into 'master'
Track project import failure

Fixes #12512 

This also help us on identify why the import process is returning the wrong status when the project was successfully imported. Like mentioned in the issue #12450 

See merge request !2538
2016-01-26 13:33:47 +00:00
Douwe Maan 9ae820ad2e Merge branch 'rs-issue-12677' into 'master'
Update text_color_for_bg helper to support RGB triplet color codes

Closes #12677

See merge request !2587
2016-01-26 12:02:42 +00:00
Douwe Maan 28e2d2142c Merge branch 'rs-groups-index' into 'master'
Make the `/groups` route behave as expected

The route is supposed to redirect the Groups#index request based on
whether or not a user was logged in. If they are, we redirect them to
their groups dashboard; if they're not, we redirect them to the public
Explore page.

But due to overly aggressive `before_action`s that weren't excluding (or including) the
`index` action, the request always resulted in a 404, whether a user was
logged in or not.

Closes #12660

See merge request !2580
2016-01-26 11:59:05 +00:00
Grzegorz Bizon 5583b9526b Add specs for build created using generic commit status 2016-01-26 08:34:48 +01:00
Douglas Barbosa Alexandre 6dd88e090e Extract Projects::ImportService service from RepositoryImportWorker 2016-01-25 22:58:30 -02:00
Robert Speicher fd33b2cdc0 Merge branch 'fix-import-redirect-loop' into 'master'
Fix import redirect loop

Fixes #11864 

See merge request !2606
2016-01-26 00:48:56 +00:00
Douglas Barbosa Alexandre cae0929a28 Merge branch 'instrumentation-signature' into 'master'
Correct arity for instrumented methods w/o args

This should fix the problem of imports not working. See https://gitlab.com/gitlab-org/gitlab-ce/issues/12450#note_3380730 for the details/context of these changes.

See merge request !2602
2016-01-26 00:04:09 +00:00
Robert Speicher 5516d2e4ee Merge branch 'rs-rails-security' into 'master'
Update rails, rails-html-sanitizer, and nokogiri for security fixes

See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643

See merge request !2603
2016-01-25 23:22:24 +00:00
Douglas Barbosa Alexandre 46c36e0e01 Fixi import redirect loop 2016-01-25 21:00:23 -02:00
Robert Speicher 47ff1c5608 Add temporary monkey patch to get specs passing on 4.2.5.1 2016-01-25 14:53:28 -08:00
Yorick Peterse b74308c0a7 Correct arity for instrumented methods w/o args
This ensures that an instrumented method that doesn't take arguments
reports an arity of 0, instead of -1.

If Ruby had a proper method for finding out the required arguments of a
method (e.g. Method#required_arguments) this would not have been an
issue. Sadly the only two methods we have are Method#parameters and
Method#arity, and both are equally painful to use.

Fixes gitlab-org/gitlab-ce#12450
2016-01-25 21:28:59 +01:00
Douglas Barbosa Alexandre 1aa82dc459 Prioritize previewable over plain README files 2016-01-25 11:27:07 -02:00
James Lopez ee209cc936 fix rubocop new 2.2 syntax issues 2016-01-25 11:44:25 +01:00
Douwe Maan 0f2a906211 Merge branch 'update-gitlab-git' into 'master'
Update gitlab_git & use new method for counting branches

Corresponding gitlab_git merge request detailing some of the rationale behind this: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/62

Fixes #12418 

See merge request !2535
2016-01-25 09:35:54 +00:00
Robert Speicher 2e911721d2 Update text_color_for_bg helper to support RGB triplet color codes
Closes #12677
2016-01-24 15:06:46 -08:00
Robert Speicher fcab1345da Update wording for 2FA requirement notice 2016-01-23 17:56:18 -08:00
Robert Speicher a7c4d0da8c Make the /groups route behave as expected
The route is supposed to redirect the Groups#index request based on
whether or not a user was logged in. If they are, we redirect them to
their groups dashboard; if they're not, we redirect them to the public
Explore page.

But due to overly aggressive `before_action`s that weren't excluding the
`index` action, the request always resulted in a 404, whether a user was
logged in or not.

Closes #12660
2016-01-23 16:10:13 -08:00
Benedict Etzel 6435f78a8c Whitelist raw "abbr" elements when parsing Markdown
Closes #12517
2016-01-23 20:38:06 +01:00
Dmitriy Zaporozhets 56b527093d Merge branch 'fix-comment-on-diff-ajax-loading' 2016-01-22 10:20:19 -08:00
Robert Speicher 3f5e6c6cf6 Merge branch 'ci/recursive-artifacts-entries' into 'master'
Add method to calculate total size of artifacts in subpath

See merge request !2500
2016-01-21 23:23:02 +00:00
Yorick Peterse 0689663487 Use branch_count in Repository#has_visible_content?
Gitlab::Git::Repository#branch_count is a tad faster than the previous
setup. See gitlab-org/gitlab_git!62 for more information.
2016-01-21 18:19:18 +01:00
Douwe Maan 54729d2c28 Merge branch 'ci/cache-key' into 'master'
Added cache:key to .gitlab-ci.yml allowing to fine tune the caching

The `cache:key` allows you to define the affinity mask of caching, allowing to have single cache for all jobs, or cache per-job, or per-branch, or any other way you would need:

1. Cache per-build for all branches:

```
cache:
    key: "$CI_BUILD_NAME"
    untracked: true
```

2. Cache per-branch for all jobs:

```
cache:
    key: "$CI_BUILD_REF"
    untracked: true
```



/cc @DouweM @grzesiek @axil


See merge request !2436
2016-01-21 11:15:28 +00:00
Rémy Coutable 82571eab43 Fix failing specs 2016-01-21 10:08:12 +01:00
Kamil Trzcinski c45a6bf3ba Added cache:key to .gitlab-ci.yml allowing to fine tune the caching 2016-01-20 23:12:48 +01:00
Robert Speicher 3e7092a83a Merge branch 'fix-github-pull-requests-import' into 'master'
Fix cross projects detection when importing GitHub pull requests

Fixes #12456

See merge request !2523
2016-01-20 22:11:20 +00:00
Douglas Barbosa Alexandre f4bdbecfd5 Fix cross projects detection when importing GitHub pull requests 2016-01-20 19:36:35 -02:00
Kamil Trzcinski 9b0f57781e Add method that calculates total size for artifacts subfolder 2016-01-20 21:55:13 +01:00
Rubén Dávila 985297d82a Merge branch 'master' into issue_3945 2016-01-20 15:07:00 -05:00
Rubén Dávila 86b75f4713 Use a MR with commits. 2016-01-20 14:41:23 -05:00
Robert Speicher 1553c560e0 Merge branch 'feature/check-against-rbl-only' into 'master'
Split from !2455

References #9092

See merge request !2515
2016-01-20 14:24:20 -05:00
Douwe Maan 7d347ae564 Merge branch 'master' into issue_3945 2016-01-20 20:04:15 +01:00
Robert Speicher e3c43ca7d0 Merge branch 'sentry-integration' into 'master'
Add sentry integration

Sentry is an event logging platform primarily focused on capturing and
aggregating exceptions. With this MR it will be possible to log and
track exceptions from GitLab to Sentry.

https://gitlab.com/gitlab-com/operations/issues/39

See merge request !2485
2016-01-20 19:00:35 +00:00
Douwe Maan 26f7d023e6 Update tests 2016-01-20 17:14:26 +01:00
Douwe Maan b4faa59728 Merge branch 'issue_3749' into 'master'
Update Issues/MRs updated_at field when notes are generated

Closes #3749 and #9130

See merge request !2493
2016-01-20 15:06:49 +00:00
Tomasz Maczukin 8536e083f7 Add IP blocking against DNSBL at sign-up 2016-01-20 15:28:19 +01:00
Douwe Maan a010db5db2 Properly handle HTML entities with inline diffs 2016-01-20 15:26:44 +01:00