20574 Commits
Author SHA1 Message Date
Robert Speicher 19daba8a6f Version 8.2.3 v8.2.3 2015-12-10 12:25:30 -05:00
Robert Speicher c6b332c390 Update CHANGELOG
[ci skip]
2015-12-09 22:33:32 -05:00
Robert SpeicherandRobert Speicher 0c0854c86a Merge branch 'devise_paranoid_mode' into 'master'
Enable Devise paranoid mode and ensure the returned message is the same
every time. This will prevent user enumeration (low impact). 

Prior to this change a user could type an email in the password reset
field and if the email didn't exist it returned an error. If the email
was valid it returned a message saying the forgot password link had been
emailed. After this change the user will receive a message that if the
email is in our database the reset link will be emailed. 

I also changed the throttle mechanism so it still works the same but
now returns the exact same message as above. Previously it would say
'You've already sent a request. Wait a few minutes'. This also allows
user enumeration, although it requires a double-check.

Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2624

See merge request !2044
2015-12-09 20:59:14 -05:00
Robert SpeicherandRobert Speicher 9888a9725b Merge branch 'yaml_safe_load' into 'master'
Use YAML.safe_load

See merge request !1941
2015-12-09 18:43:44 -05:00
Douwe MaanandRobert Speicher 0ece3d6552 Merge branch 'fix-merge-request-that-removes-submodule' into 'master'
Fix 500 error when creating a merge request that removes a submodule

Fixes #3476

See merge request !1989
2015-12-08 17:15:37 -05:00
Robert Speicher 3839706253 Update CHANGELOG
[ci skip]
2015-12-07 14:43:01 -05:00
Grzegorz BizonandRobert Speicher 23975e093b Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
2015-12-07 14:33:36 -05:00
Valery SizovandRobert Speicher e70ac793a2 Merge branch 'webhook_payload_with_changes' into 'master'
Add added, modified and removed properties to commit object in webhook

https://gitlab.com/gitlab-org/gitlab-ee/issues/20

See merge request !1988
2015-12-07 14:31:49 -05:00
Douwe MaanandRobert Speicher 46d24898ed Merge branch 'fix-global-milestones-error-500' into 'master'
Fix Error 500 when creating global milestones with Unicode characters

Two issues:

1. The constraints in the resources were incorrect. Here's what it was before:

```
group_milestone  GET /groups/:group_id/milestones/:id(.:format)  groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```

In this case, id is actually the title of the milestone, which can be anything at the moment.

After:
```
group_milestone  GET /groups/:group_id/milestones/:id(.:format)  groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```

2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like:

```
ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]):
```

This change uses the babosa library to create a better slug, which surprisingly
isn't actually used by the global milestone controllers. Instead, they use the
title passed as a query string for some reason.

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

See merge request !1983
2015-12-07 14:28:31 -05:00
Job van der VoortandRobert Speicher a418f64100 Merge branch 'fix_permission_doc' into 'master'
fixed the documentation of the Guest role in permission.md

This MR fixes the documentation of the Guest role.

closes gitlab-org/gitlab-ce#3777

[ci skip]

See merge request !1952
2015-12-05 14:55:48 -05:00
Dmitriy ZaporozhetsandRobert Speicher cd4a33120a Merge branch 'fix-application-settings-not-expiring' into 'master'
Fix application settings cache not expiring after changes

cache_key is an instance method that relies on updated_at. When changes
were made, the time-dependent key was being used instead of X.application_setting.last.

Closes #3609

See merge request !1972
2015-12-04 14:36:30 -05:00
Robert Speicher 08fae2fd05 Version 8.2.2 v8.2.2 2015-12-02 11:48:27 -05:00
Dmitriy ZaporozhetsandRobert Speicher d2e60e7eed Merge branch 'gmail_actions_links_on_set_of_emails' into 'master'
Show Gmail actions links only on expected set of emails



See merge request !1901
2015-12-02 11:17:56 -05:00
Robert SpeicherandRobert Speicher e664de6d59 Merge branch 'install-guide-gitlab-shell-version' into 'master'
Install gitlab-shell 2.6.8 in installations from source

[ci skip]

See merge request !1932
2015-12-01 16:31:55 -05:00
Valery SizovandRobert Speicher 49db8b7970 Merge branch 'upload_hook' into 'master'
Fire update hook from GitLab

https://gitlab.com/gitlab-org/gitlab-ce/issues/3069

See merge request !1882
2015-11-30 14:05:35 -05:00
Robert Speicher 45f15602c2 Update CHANGELOG
[ci skip]
2015-11-30 12:04:20 -05:00
Robert Speicher 531272a520 Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'
See merge request !1916
2015-11-30 12:03:13 -05:00
Dmitriy ZaporozhetsandRobert Speicher d2f21bf72a Merge branch 'fix-admin-page-personal-projects' into 'master'
Fix Error 500 when viewing user's personal projects from admin page

This is a regression introduced in 4d7f00f.

Closes #3680

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

Closes gitlab-org/gitlab-ee#90

See merge request !1909
2015-11-30 11:57:26 -05:00
Dmitriy ZaporozhetsandRobert Speicher 3b9a910938 Merge branch 'expire-application-settings-startup' of https://gitlab.com/stanhu/gitlab-ce 2015-11-30 11:54:44 -05:00
Robert Speicher 0bbf7563a6 Update CHANGELOG 2015-11-27 14:45:08 -05:00
Douwe MaanandRobert Speicher 412120de02 Merge branch 'dbalexandre/gitlab-ce-fix-raw-personal-snippet-access-workflow' 2015-11-27 14:43:42 -05:00
Robert SpeicherandRobert Speicher f160bd3f0c Merge branch 'nginx-workhorse-upload-limit' into 'master'
Nginx workhorse upload limit

See merge request !1919
2015-11-27 14:41:23 -05:00
Jacob Vosmaer e53c0c5572 Version 8.2.1 v8.2.1 2015-11-25 14:45:29 +01:00
Dmitriy Zaporozhets 9a644c1611 Merge branch 'bump-gitlab-shell-stable' into '8-2-stable'
Bump gitlab-shell to 2.6.8 in stable

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For gitlab/gitlabhq#2635

See merge request !1940
2015-11-25 13:18:07 +00:00
Dmitriy Zaporozhets 80c7a95882 Bump gitlab-shell to 2.6.8
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-25 13:10:43 +01:00
Robert SpeicherandRobert Speicher e696bdcdaa Merge branch 'session_expire_delay_cannot_be_nil' into 'master'
Maybe rescue session_expire_delay by setting a default value.

Related to gitlab-org/omnibus-gitlab#956

See merge request !1880
2015-11-24 21:28:00 -05:00
Dmitriy ZaporozhetsandRobert Speicher 367d178564 Merge branch 'required_version_and_docs_update' into 'master'
Update required version of lfs client and separate the docs for users and admins.



See merge request !1855
2015-11-24 12:01:39 -05:00
Robert SpeicherandRobert Speicher 69383ac266 Merge branch 'ci-artifacts-path' into 'master'
Expose artifacts path

This fixes broken artifacts storage path.

Fixes #3607 
Fixes #3608

Related: gitlab-org/omnibus-gitlab!544

See merge request !1869
2015-11-23 17:19:54 -05:00
Robert Speicher 320c86abd7 Update CHANGELOG
[ci skip]
2015-11-23 16:53:35 -05:00
Robert SpeicherandRobert Speicher 3017037fc7 Merge branch 'ci-fix-500' into 'master'
Fix 500 when using CI

- Fix for Ci::Build state machine, allowing to process builds without the project
- Forcefully update builds that didn't want to update with state machine
- Fix saving GitLabCiService as Admin Template

Fixes #3556 

See merge request !1873
2015-11-23 16:53:19 -05:00
Robert SpeicherandRobert Speicher 6c280423fb Merge branch 'fix-clipboard-styling-in-create-mr' into 'master'
Fix CSS styling for clipboard icon in new MR page

Closes #3602 

See merge request !1870
2015-11-23 16:43:36 -05:00
Robert Speicher d6bcf446b1 Version 8.2.0 v8.2.0 2015-11-21 23:28:33 -05:00
Robert SpeicherandRobert Speicher dbcd646296 Merge branch 'award_fix' into 'master'
Emoji bug: Invalid url to image

Closes #3591

See merge request !1868
2015-11-21 23:11:45 -05:00
Dmitriy ZaporozhetsandRobert Speicher aeaa5b5037 Merge branch 'fix-merge-requests-without-source-projects' into 'master'
Handle removed source projects in MR CI commits

Fixes #3599 

@dzaporozhets assigning this to you since you wrote the original code. Perhaps checking for the source project isn't the right way, but I'm not sure if there's a better way (e.g. somewhere earlier in the process) that we can detect this.

See merge request !1859
2015-11-21 22:53:08 -05:00
Robert SpeicherandRobert Speicher 94b33caf84 Merge branch 'fix-award-emoji-api' into 'master'
Add upvote/downvote fields to merge request and note API to preserve compatibility

As discussed in !1825 we should not break the API compatibility.

* This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`.
* Add the fields `upvote`/`downvote` to the notes API, which always return `false`

This behavior is documented in the API docs.

See merge request !1867
2015-11-21 22:46:18 -05:00
Stan HuandRobert Speicher 27821ce01f Merge branch 'consistent-tags-api' into 'master'
Make tag API for release feature consistent

Make tags API consistent with other tags methods. This changes the endpoint from `PUT /projects/:id/repository/:tag/release` to `PUT /projects/:id/repository/tags/:tag_name/release`.

On thing the API is still missing, is an error if the tag does not exist. Right now it returns 200 even the tag does not exist. I'll fix that such it returns 404.

@stanhu Can you review?
@rspeicher This MR should go into 8.2

See merge request !1864
2015-11-21 22:38:13 -05:00
Robert SpeicherandRobert Speicher 53c0b6213f Merge branch 'award_fix' into 'master'
Award Emoji: fix for merge requests

Closes #3597

See merge request !1865
2015-11-21 13:59:25 -05:00
Robert Speicher d241253fff Add award_emoji.png doc image
[ci skip]
2015-11-21 13:16:39 -05:00
Robert SpeicherandRobert Speicher 098aec21f7 Merge branch 'issue_3598' into 'master'
Remove accidentally added line.

Reference: #3598 

See merge request !1858
2015-11-21 12:20:44 -05:00
Stan HuandRobert Speicher 0df5340036 Merge branch 'fix-drone-service-hook' into 'master'
Fix Drone web hook URL not being updated

Fixes regression of !1774: fixes Drone Web hook for both service templates and project services.



See merge request !1856
2015-11-21 11:11:44 -05:00
Robert SpeicherandRobert Speicher ae36d23497 Merge branch 'award-emoji-doc' into 'master'
Use award emoticons in GitLab workflow

Remove the old voting slides and use the emoji bar.

[ci skip]

See merge request !1863
2015-11-21 11:09:19 -05:00
Robert SpeicherandRobert Speicher 81134fd03a Merge branch 'api-tags-doc' into 'master'
Add tags page to readme

The tags page was separated for the release feature but not to the index readme.

[ci skip]

See merge request !1861
2015-11-21 10:50:56 -05:00
Robert Speicher 3e48a136ac Version 8.2.0.rc2 v8.2.0.rc2 2015-11-20 11:18:48 -05:00
Jacob VosmaerandRobert Speicher b6ec1714a9 Merge branch 'workhorse-version' into 'master'
Bump GitLab Workhorse version to 0.4.2



See merge request !1830
2015-11-20 10:25:38 -05:00
Dmitriy Zaporozhets b6f0eddce5 Merge branch 'lfs-batch-download-to-stable' into '8-2-stable'
Lfs batch download to stable

!1842 for stable

See merge request !1853
2015-11-20 12:59:53 +00:00
Dmitriy Zaporozhets ea27943291 Merge branch 'lfs_on_by_default_and_backup' into '8-2-stable'
Lfs on by default and backup



See merge request !1852
2015-11-20 12:04:12 +00:00
Marin Jankovski 89dec03c73 Error 501 when client is using deprecated API. 2015-11-20 12:50:47 +01:00
Kamil TrzcinskiandMarin Jankovski 760dc3e42c Fix upload tests, reformat code and make rubocop happy 2015-11-20 12:50:45 +01:00
Kamil TrzcinskiandMarin Jankovski 7ea48bfb25 Part of tests done [ci skip] 2015-11-20 12:50:42 +01:00
Kamil TrzcinskiandMarin Jankovski 2811347884 Add support for batch download operation 2015-11-20 12:49:07 +01:00