Commit Graph
22224 Commits
Author SHA1 Message Date
Douwe Maan f5ec1ebe2c Remove changelog entry issue number 2015-12-07 12:07:13 +01:00
Zeger-Jan van de Weg 3da32ef7d8 Merge branch 'master' into rake-tasks-git 2015-12-07 12:06:20 +01:00
Douwe Maan 0bca65b283 Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-date 2015-12-07 12:03:34 +01:00
Zeger-Jan van de Weg 4c8666e69f Fix commit message textarea position 2015-12-07 11:30:09 +01:00
Zeger-Jan van de Weg 96520227ae Prevent Firefox from remembering hidden field value 2015-12-07 11:29:48 +01:00
Zeger-Jan van de Weg 6eb75ed6ad Fix specs 2015-12-07 11:29:23 +01:00
Grzegorz Bizon 893d08c0dc Simplify contains_emoji_only? method in Note 2015-12-07 11:00:03 +01:00
Tobias Stöckler 900d3a09a7 Fix typos in integration docs 2015-12-07 10:28:47 +01:00
Zeger-Jan van de Weg cfc95b8287 Fix schema 2015-12-07 10:14:37 +01:00
Zeger-Jan van de Weg 0e96d6eb10 Merge branch 'master' into merge-if-green 2015-12-07 10:06:07 +01:00
Zeger-Jan van de Weg 46278ec7ba Button fix 2015-12-07 09:59:16 +01:00
Eirik Lygre 88217029fc When rendering the clone page, check user profile to decide default clone protocol. If the user has uploaded SSH-keys, use SSH; otherwise, use http(s). Close #3504. 2015-12-06 20:48:04 +01:00
Stan Hu 234f4bf20f Merge branch 'fix-gitlab-workhorse-initd-check' into 'master'
Check GitLab Workhorse status in init.d script when reporting all components are up and running

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

See merge request !1969
2015-12-06 17:36:35 +00:00
Stan Hu e2c57a416d Merge branch 'duplicate_notifications_fix' into 'master'
Fixed duplicated issue note email notifications.

Fixes #2560 



See issue for the details.

Without `uniq` modified tests were failing with:
```
     Failure/Error: notification.new_note(note)
       (Notify (class)).note_issue_email(21, 1)
           expected: 1 time with arguments: (21, 1)
           received: 2 times with arguments: (21, 1)
     # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/extensions/action_mailer.rb:17:in `public_send'
     # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/extensions/action_mailer.rb:17:in `perform'
     # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/testing.rb:74:in `block in raw_push'
     # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/testing.rb:69:in `each'
     # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/testing.rb:69:in `raw_push'
     # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/client.rb:68:in `push'
     # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/worker.rb:85:in `client_push'
     # /home/bak1an/.rvm/gems/ruby-2.1.6@gitlab/gems/sidekiq-3.3.0/lib/sidekiq/extensions/generic_proxy.rb:19:in `method_missing'
     # ./app/services/notification_service.rb:144:in `block in new_note'
     # ./app/services/notification_service.rb:143:in `each'
     # ./app/services/notification_service.rb:143:in `new_note'
     # ./spec/services/notification_service_spec.rb:63:in `block (5 levels) in <top (required)>'
```

I have also added `once` to all `should_email` checks within `notification_service_spec.rb` since it's probably the correct behavior to notify users only once on the same event. Nothing else failed out of the box but we can keep these assertions for future.

See merge request !1925
2015-12-06 15:13:53 +00:00
Stan Hu 631a30276e Fix API setting of 'public' attribute to false will make a project private
Closes #3864
2015-12-05 17:39:36 -08:00
Vyacheslav Stetskevych 1c4213acd5 Fix gitlab-ssl nginx config to work when multiple server_names are served over https 2015-12-06 03:10:29 +02:00
Anton Baklanov caa6851bf5 Fixed duplicated issue note email notifications.
Fixes #2560
2015-12-06 01:20:42 +02:00
Sytse Sijbrandij ee134d09e7 Move release cycle comments to the documentation. 2015-12-05 15:06:32 -08:00
Robert Speicher 6ee43ada3a Bump gitlab_emoji to ~> 0.2.0 2015-12-05 17:49:32 -05:00
Sytse Sijbrandij 0ba1efbb05 Link to the gitlab-ci.yml file of GitLab itself. 2015-12-05 14:24:56 -08:00
Grzegorz Bizon bfe91b692a Remove space before exclamation mark in award alert
[ci skip]
2015-12-05 22:18:13 +01:00
Grzegorz Bizon 176d6e2a8f Refactor note awards to reuse emoji_pattern and improve validator 2015-12-05 22:09:52 +01:00
Stan Hu 4294d2cdff Merge pull request #9876 from atomaka/atomaka/feature/project-limit-notify
Clarify Project Limit Reached
2015-12-05 12:22:58 -08:00
Andrew Tomaka 1c53dc28b5 Notify user if they cannot create projects 2015-12-05 11:32:08 -05:00
Zeger-Jan van de Weg 2462a96e45 Incorporate feedback 2015-12-05 15:42:38 +01:00
Stan Hu 4fab178850 Fix spec that broke due to fact that iid is needed, not id, for MilestonesController 2015-12-05 00:04:44 -08:00
Stan Hu d800a949d2 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

Fix constraints
2015-12-05 00:04:44 -08:00
Robert Speicher d2f9a9012d Merge branch 'link-refs' into 'master'
Recognize issue/MR/snippet/commit links as references.

Fixes #3744 and #3745

See merge request !1933
2015-12-04 20:58:45 +00:00
Douglas Barbosa Alexandre 29e5506799 Merge branch 'master' into style-warning-about-mentioning-many-people-in-a-comment 2015-12-04 18:11:49 -02:00
Douglas Barbosa Alexandre 23c1c70bf0 Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-group 2015-12-04 18:09:22 -02:00
Robert Speicher 3c8051776b Update CHANGELOG
[ci skip]
2015-12-04 14:35:29 -05:00
Douglas Barbosa Alexandre 12fdc13ad3 Fix 500 error when creating a merge request that removes a submodule 2015-12-04 17:35:14 -02:00
Dmitriy Zaporozhets e7e22ece5a Merge branch 'issue_3583' into 'master'
Ensure "Remove Source Branch" button is not shown when branch is being deleted.

Given the merging of the Merge Request happens in the background, sometimes when the client JS code reloads the page the source branch is not still gone.

This fix appends a new query string parameter that is checked in the view before rendering the `Remove Source Branch` button.

Closes #3583

See merge request !1897
2015-12-04 17:01:03 +00:00
Dmitriy Zaporozhets 40143a8eee 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 16:54:50 +00:00
Douwe Maan eafa55f105 Merge branch 'make-current-user-first-in-dropdown' into 'master'
Make current user the first user in assignee dropdown in issues detail page

Closes #3679

See merge request !1913
2015-12-04 16:48:38 +00:00
Rubén Dávila aa1ba00936 Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583 2015-12-04 10:43:33 -05:00
Stan Hu 253301bb47 Make current user the first user in assignee dropdown in issues detail page
Closes #3679
2015-12-04 07:14:04 -08:00
Stan Hu ba3c702073 Fix spec 2015-12-04 07:13:28 -08:00
Stan Hu a120b78940 Handle and report SSL errors in Web hook test. Check for status 200 for success.
If a Web hook test fails due to an SSL error or some other error, report
the result back to the user instead of an Error 500.

Closes #3656

Handle response
2015-12-04 07:13:28 -08:00
Stan Hu f1fd4880d9 Check GitLab Workhorse status in init.d script when reporting all components are up and running
Closes https://github.com/gitlabhq/gitlabhq/issues/9869
2015-12-04 07:12:49 -08:00
Stan Hu 32b45493b8 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
2015-12-04 07:11:25 -08:00
Valery Sizov 5c1b49f494 Add added, modified and removed properties to commit object in webhook 2015-12-04 16:23:21 +02:00
Dmitriy Zaporozhets 238ca3e472 Merge remote-tracking branch 'origin/ui/issuable-form'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-04 15:12:03 +01:00
Gabriel Mazetto 496870ddec Migrate from Sidetiq to Sidekiq-cron
Updated Sidekiq to 3.5.x
2015-12-04 11:29:45 -02:00
Dmitriy Zaporozhets 4de7f32c60 Merge branch 'extend-events-api' 2015-12-04 13:51:30 +01:00
Dmitriy Zaporozhets 1f5a6eb257 Merge branch 'mr-commits-api' into 'master'
Add API endpoint to fetch merge request commits list

Fixes #3748 

See merge request !1984
2015-12-04 12:08:34 +00:00
Marin Jankovski 0c377a79d4 Merge branch 'fix_mailer_queue' into 'master'
Fix mailers queue

The `mailer` queue can be removed.

See merge request !1975
2015-12-04 11:48:32 +00:00
Marin Jankovski b2c4675cb0 Recursivity needed if a fork is a fork of a fork. 2015-12-04 12:32:13 +01:00
Dmitriy Zaporozhets 3227a5ead2 Extent Event and Note API
* add note to Events API
* add author section to Events API
* add noteable_id and noteable_type to Notes API

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-04 12:22:50 +01:00
Marin Jankovski b9a0f96d42 Don't show diffs for lfs pointers. 2015-12-04 12:01:08 +01:00