Commit Graph
3546 Commits
Author SHA1 Message Date
Robert SpeicherandRobert Speicher c7a3d75973 Merge branch 'git-2-7-3' into 'master'
Bump Git version requirement to 2.7.3

[ci skip]

See merge request !3240
2016-03-15 18:28:33 -04:00
Jacob Vosmaer bf253a1087 Obtain lease before querying LDAP 2016-03-11 13:47:49 +01:00
Jacob Vosmaer 73c777cf67 Backport ExclusiveLease to 8.5 2016-03-11 13:38:58 +01:00
Rémy Coutable a8ca1d5016 Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master'
Fix import from gitlab.com fails

_Originally opened at !2896 by @kazsw._

- - -

Fixes #12652

CGI.escape encodes '/' by default.
Second argument can be removed.

See merge request !2988
2016-03-02 11:43:19 +01:00
Marin JankovskiandRémy Coutable 4f946f037a Merge branch 'uploads-700' into 'master'
Restrict permissions on public/uploads

Based on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/631

See merge request !2764
2016-02-23 16:21:27 +01:00
Kamil TrzcińskiandRémy Coutable ba893daf53 Merge branch 'builds-artifacts-API' into 'master'
Introduce API for serving the artifacts archive

Add API to download build artifacts archive in context of GitLab API

/cc @DouweM @grzesiek 

See merge request !2893
2016-02-21 20:59:39 +01:00
Grzegorz BizonandRémy Coutable 62067b74c8 Merge branch 'ci/remove-builds' into 'master'
Make it possible to erase build content (artifacts, trace)

This feature makes it possible to remove build content - build artifacts and build traces.

- [x] Remove artifacts
- [x] Remove metadata
- [x] Remove build traces
- [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged
- [x] Fix the permissions after the merge

Closes #3421

See merge request !2560
2016-02-19 18:22:49 +01:00
Patricio CanoandRémy Coutable c1921fb510 Merge branch 'saml-decoupling' into 'master' 2016-02-19 16:45:18 +01:00
Kamil TrzcińskiandRémy Coutable 778da50251 Merge branch 'ci/api-runners' into 'master'
Add runners API

References #4264

See merge request !2640
2016-02-19 16:32:43 +01:00
Douwe MaanandRémy Coutable da0953e652 Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness 

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800
2016-02-19 16:29:55 +01:00
Robert SpeicherandRémy Coutable 10354f7a58 Merge branch 'cache-clear' into 'master'
Use SCAN during 'rake cache:clear'

This allows 'rake cache:clear' to delete millions of keys without
choking. It requires Redis 2.8.0 or newer but we needed that already
anyway.

See merge request !2872
2016-02-19 16:25:23 +01:00
Kamil TrzcińskiandRémy Coutable bdbe892ea2 Merge branch 'fix/ci-first-job-allow-failure' into 'master'
Fix CI builds scheduler when first build in stage is allowed to fail

This fixes an edge case in CI builds scheduler when first build in stage was marked as allowed to fail.

Closes #3192

See merge request !2869
2016-02-18 16:18:45 +01:00
Achilleas PipinellisandRémy Coutable cdc928d47f Merge branch 'sqlite_rm_rf' into 'master'
Remove remaining sqlite method call

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

See merge request !2862
2016-02-18 13:00:04 +01:00
Douwe Maan 28d42a33f3 Merge branch 'rs-issue-13469' into 'master'
Handle nil commits in Gitlab::PushDataBuilder.build

Closes #13469

See merge request !2825
2016-02-17 14:19:20 +00:00
Douwe Maan bbbfdba0b9 Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master'
Add new data to project in push, issue, merge-request and note webhooks data

_Originally opened at !2738 by @bugagazavr._

- - -

**What does this MR do?**

Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks )

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

1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738
2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132
3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52
4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56

**Why was this MR needed?**

More information about user for push events, and more data about repositiry ( project )

**What are the relevant issue numbers?**

No

**Screenshots (if relevant)**

No

See merge request !2788
2016-02-16 13:08:36 +00:00
Robert Speicher 789aef7f26 Handle nil commits in Gitlab::PushDataBuilder.build
Closes #13469
2016-02-15 16:06:45 -05:00
Robert Speicher 447568d15f Fix undefined method postgresql? during migration 2016-02-15 14:13:47 -05:00
Ben BoeckelandRémy Coutable e919b5a4e9 Fix relative links in other markup formats
- Apply the RelativeLinkFilter filter to other formats, e.g.,
  reStructuredText so links from the Files view or the Project view work
- Remove the AsciidocPipeline pipeline

Fixes #3533.
2016-02-12 17:20:59 +01:00
Douwe Maan 0807bd5130 Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into 'master'
API: Allow to set or update a merge-request's milestone

_Originally opened at !2107 by @ skakirill._

- - -


See merge request !2755
2016-02-12 08:39:18 +00:00
Rubén Dávila 5a5ee6188b Load all blob data when highlighting content for git-blame. 2016-02-11 18:30:05 -05:00
Jeroen van Baarsen 95d16e75a3 Merge branch 'remove_sqlite_check' into 'master'
Remove sqlite check in raketask

This is a relic from 4 major releases ago. Time to remove it.

See merge request !2777
2016-02-11 18:22:14 +00:00
Rémy Coutable 973a7d040e Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' into 'master'
Add merge_requests/:merge_request_id/closes_issues

_Originally opened at !2660 by @Schniz._

- - -

Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully

See merge request !2779
2016-02-11 17:13:36 +00:00
Kirill ZaitsevandRémy Coutable b123171d3d Add new data to project in push, issue, merge-request and note webhooks data
- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`,
  `path_with_namespace` and `default_branch` in `project` in push, issue,
  merge-request and note webhooks data
- Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in
  favor of `git_http_url` in `project` for push, issue, merge-request and
  note webhooks data
- Deprecate the `repository` key in push, issue, merge-request and
  note webhooks data, use `project` instead
2016-02-11 17:22:11 +01:00
Rémy Coutable b91d1890a8 Pass current_user to merge_request.closes_issues in API ans streamline MR API specs 2016-02-11 09:34:07 +01:00
Gal SchlezingerandRémy Coutable 78e36780be Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' route in the API
Added some documentation for it

Added to changelog

Added curl example and an attribute table

Moved the api route definition from "lib/api/issues.rb" to "lib/api/merge_requests.rb"

Fixed the attributes and changed the documentation to be at "merge_requests.md" too

Changed generic titles to more specific titles

added an underscore

added tests. it depends on a newer version of gitlab-test project
I'm doing a  since I need to add a branch to the `gitlab-test` repo

removed the before

using 'iid' instead of 'id' in the description to reference the issues. that makes the tests pass

Removed the 'closes-issues' key from test_env. so it should pass the tests

Moved the two initializations to the describe block

Changed the changelog
2016-02-11 09:34:07 +01:00
Achilleas Pipinellis f8036ec910 Remove sqlite check in raketask 2016-02-10 16:54:15 +02:00
Achilleas Pipinellis 10aa99a30c Merge branch 'doc_relative_url' into 'master'
Add documentation on relative URL support

closes #12773

See merge request !2770
2016-02-10 10:51:18 +00:00
Robert Speicher 069937d2c7 Merge branch 'freeze-constants-lib-gitlab-git' into 'master'
Freeze constants in Gitlab::Git

See merge request !1730
2016-02-09 18:14:50 +00:00
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Douwe Maan 6b0801d4f3 Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master'
Expose MergeRequest#merge_status

_Originally opened at !2478 by @develop7._

- - -

This enables API users to see whether a merge request can be merged without conflicts.

See merge request !2756
2016-02-09 16:01:20 +00:00
Achilleas Pipinellis b532109b97 Edit configuration files for relative URL support
[ci skip]
2016-02-09 16:59:42 +02:00
Douwe Maan aacde42d55 Merge branch 'rs-broadcast-markdown' into 'master'
Allow limited Markdown in Broadcast Messages

Closes #11853

See merge request !2695
2016-02-09 11:44:08 +00:00
Douwe Maan ceb342c716 Merge branch 'increase_import_timeout' into 'master'
Increase project import timeout from 4 minutes to 15 minutes

Many users were experiencing timeouts when we only allowed
4 minutes before a timeout. A 15 minute timeout is more
than reasonable and prevents us from having to add a
configuration for this.

Fixes gitlab-org/gitlab-ee#246

## Import screenshot

![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png)


See merge request !2717
2016-02-09 10:41:11 +00:00
Valery Sizov e0d7d2e9b4 Merge branch 'snippet_search_refactoring' 2016-02-09 12:04:59 +02:00
Robert Speicher 76fbb42a47 Merge branch 'backup-database-timeout-fix' into 'master'
Fix timeout issue for rake task gitlab:backup:create

This is a fix for a database timeout which can occur when the backup
create task is taking very long (1-2 hours).
It seems that ActiveRecord is loosing the connection after a hour
idleness and need to be reconnected before use.

See merge request !2757
2016-02-08 23:50:10 +00:00
Robert Speicher 16abacb1f0 Merge branch 'huacnlee/current-settings-autoload-bug-in-development' into 'master'
Fix CurrentSettings autoload bug in development

_Originally opened at !2526 by @huacnlee._

- - -

In development env, when we changed any file hit Rails reload, it will failed with this message:

```
A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
```

See merge request !2753
2016-02-08 22:58:00 +00:00
Rémy Coutable 555b1a621a Merge branch 'fix-init' into 'master'
Fixed init.d script not working on OS X

-s flag of su doesn't work correctly on OS X, logging in as the user
and not running the requested command. By moving the bash shell init
inside the su command we avoid the issue

Fixes Issue #3309 

See merge request !1728
2016-02-08 17:30:10 +00:00
Jeroen Nijhof 897f18032a Make sure there is a connection before using ActiveRecord 2016-02-08 17:31:24 +01:00
Andrei DziahelandRémy Coutable 86d15c1e9a Expose MergeRequest::merge_status to API 2016-02-08 17:04:58 +01:00
ritave 1fab3979b1 Fixed init.d script not working on OS X
-s flag of su doesn't work correctly on some systems, loging in the user
and not running the requested command. By moving the bash shell init
inside the su command we avoid the issue
2016-02-08 16:56:07 +01:00
Kirill SkachkovandRémy Coutable 81f2a9e5b0 API: Allow to set or update a merge-request's milestone 2016-02-08 15:49:35 +01:00
Jason LeeandRémy Coutable e4d276816a Fix CurrentSettings autoload bug in development.
Error: A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
2016-02-08 15:28:48 +01:00
Harald Spaethe 2694513cfe suppress only errors in init-script while determining canonical path of gitlab_workhorse_dir 2016-02-08 14:58:49 +01:00
Robert Speicher 89b3ddd609 Allow limited Markdown in Broadcast Messages
Closes #11853
2016-02-06 14:30:07 -05:00
Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions
# Conflicts:
#	db/schema.rb
2016-02-05 20:15:32 +01:00
Valery Sizov 8f929b8747 one more improvement to snippet search 2016-02-05 18:27:12 +02:00
Valery Sizov 94af78ac4a Faster snippet search 2016-02-05 18:20:29 +02:00
Zeger-Jan van de Weg 5ffec2c953 Freeze the expression instead of the literal
Also remove the spec for it
2016-02-05 08:39:44 +01:00
Zeger-Jan van de Weg be3399868c Minor refactoring on Gitlab::Git 2016-02-05 08:39:44 +01:00
Drew Blessing 5f38dbc026 Increase project import timeout from 4 minutes to 15 minutes
Many users were experiencing timeouts when we only allowed
4 minutes before a timeout. A 15 minute timeout is more
than reasonable and prevents us from having to add a
configuration for this.

Fixes gitlab-org/gitlab-ee#246
2016-02-04 13:41:42 -06:00