Commit Graph
21075 Commits
Author SHA1 Message Date
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
Anton Baklanov caa6851bf5 Fixed duplicated issue note email notifications.
Fixes #2560
2015-12-06 01:20:42 +02: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
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
Robert Speicher 3c8051776b Update CHANGELOG
[ci skip]
2015-12-04 14:35:29 -05: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 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
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
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
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
Dmitriy Zaporozhets c366e81da7 Improve docs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-04 11:26:35 +01:00
Dmitriy Zaporozhets 0b68a0e79e Add API endpoint to fetch merge request commits list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-04 11:08:10 +01:00
Dmitriy Zaporozhets 0ccd7de7f3 Fix wrong doc in merge request API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-04 10:55:36 +01:00
Dmitriy Zaporozhets abf54f230e Merge branch 'ui/sidebar' into 'master'
UI: Sidebar & header tweaks and fixes

Depends on !1953 

See the commits for more details, the messages mostly speak for themselves.

![Logo](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba088150165bb0a0aea1e894f3443f43/logo_tooltip.png)

![Sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1e8c09ac3bf489cdb9531eebea18c90/sidebar_tooltips.png)

Fixes #2928, #2071, https://dev.gitlab.org/gitlab/gitlabhq/issues/2575, and https://dev.gitlab.org/gitlab/gitlabhq/issues/2573

See merge request !1958
2015-12-04 09:31:28 +00:00
Dmitriy Zaporozhets eb9601d906 Merge branch 'ui/form-consistency' into 'master'
UI: Improve form consistency

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Tag form

Before:

![tag_before](/uploads/ee5ba6ef405749013f9e5717ebcf72f3/tag_before.png)

After:

![tag_after](/uploads/71bb543553190d91c03fd706cce35923/tag_after.png)


See merge request !1955
2015-12-04 09:27:27 +00:00
Dmitriy Zaporozhets de3a175486 Merge branch 'ui/login-page' into 'master'
Fix background and padding of login and error pages

Was gray, is white again.

See merge request !1978
2015-12-04 09:24:42 +00:00
Achilleas Pipinellis 14010b9eff Merge branch 'doc-ssh' into 'master'
Correction of markdown in SSH docs

Correction of broken markdown in SSH docs

See merge request !1900
2015-12-04 08:48:03 +00:00
Robert Speicher e9d06903da Merge branch 'fork-event' into 'master'
Don't show project fork event as imported

See merge request !1949
2015-12-03 23:52:34 +00:00
Robert Speicher 05d5485dd4 Merge branch 'new-tag-branch-authorization' into 'master'
Add authorization to new branch/tag pages.

The create actions have authorization, the new actions didn't,
so no-one unauthorized could actually do anything, but it was wrong(TM).

See merge request !1979
2015-12-03 23:46:55 +00:00
Robert Speicher bcf74d6e8c Merge branch 'fix-ruby-version' into 'master'
Update .ruby-version to 2.1.7

Fixes #3835

See merge request !1980
2015-12-03 23:39:17 +00:00
Kamil Trzciński 95fd79834a Merge branch 'ci_docker_docs' into 'master'
fixes #3263 slashes are replaced with two underscores



See merge request !1981
2015-12-03 22:49:40 +00:00
Kevin Pankonen 387e5656a1 fixes #3263 slashes are replaced with two underscores 2015-12-03 15:41:42 -07:00
Robert Schilling 83e6d8294f Update .ruby-version to 2.1.7 2015-12-03 23:14:19 +01:00
Drew Blessing 1481255efa Merge branch 'issue_3468_broken_link' into 'master'
Fixed invalid link on starred projects dashboard.

Fixes #3468

The MR fixes 'Project' links on a dashboard pages headers. See the issue for the details.

This MR does not include tests since the change is rather trivial and there are no (as far as I have seen) existing tests for checking links validity.

In case tests are required I would like to get some guidance on the implementation first. At least I would like to know what should be covered: changed links, all header links, all navigation?

See merge request !1926
2015-12-03 21:13:00 +00:00
Dmitriy Zaporozhets abb7261889 Merge branch 'ui/wiki' into 'master'
UI: Use new style for wiki

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Wiki Page

Before:

![Screen_Shot_2015-12-02_at_17.48.45](/uploads/aa53f768b8760f2e15d765e06d5ff773/Screen_Shot_2015-12-02_at_17.48.45.png)

After:

![Screen_Shot_2015-12-02_at_17.48.16](/uploads/f8a376651aff9c8de82621578aaeb002/Screen_Shot_2015-12-02_at_17.48.16.png)

## Edit Wiki Page

Before:

![Screen_Shot_2015-12-02_at_17.48.59](/uploads/c9ffddaca3156046b99cba11bdb0ea4f/Screen_Shot_2015-12-02_at_17.48.59.png)

After:

![Screen_Shot_2015-12-02_at_17.48.26](/uploads/1aa62049f120c91436ed68fd7441c156/Screen_Shot_2015-12-02_at_17.48.26.png)

See merge request !1967
2015-12-03 20:17:48 +00:00
Dmitriy Zaporozhets e7452c6b8f Merge branch 'ui/new-project' into 'master'
UI: New Project form tweaks

Depends on !1953 

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.43.23](/uploads/302e734f6796a85a9f4be9c2f494869d/Screen_Shot_2015-12-02_at_17.43.23.png)

After:

![Screen_Shot_2015-12-02_at_17.44.11](/uploads/411980e53a4f87cf0a04e5bcb7329f82/Screen_Shot_2015-12-02_at_17.44.11.png)


See merge request !1964
2015-12-03 19:46:47 +00:00
Dmitriy Zaporozhets 805b4cf522 Merge branch 'ui/issuable-filter' into 'master'
UI: Issuable filter tweaks

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Filter bar

Before:

![filter_before](/uploads/b061be7521c6d5babb77c7d12e77f65e/filter_before.png)

After:

![filter_after](/uploads/aadfbcd77caf1b49fde8ca6d781f1004/filter_after.png)

## Bulk edit bar

Before:

![bulk_before](/uploads/849c98224e1f335c65c0de5616bbcdae/bulk_before.png)

After:

![bulk_after](/uploads/185d29116663f9f663acab76d328096f/bulk_after.png)


See merge request !1963
2015-12-03 19:43:41 +00:00
Dmitriy Zaporozhets 15ea12859c Merge branch 'bugfix/star_cache' into 'master'
Touch project when toggling stars to update cache

This is a fix for gitlab-org/gitlab-ce#3513.

When a star toggle event happens, we touch project to clear cache key.
This will trigger a new "updated_at" at the project model. If it's undesirable, please let me know and I will try to solve it in a different way.

See merge request !1970
2015-12-03 19:23:45 +00:00
Anton Baklanov c5b6b31c84 Fixed invalid link on starred projects dashboard.
Fixes #3468
2015-12-03 21:06:15 +02:00
Douwe Maan e5c865eebf Fix specs 2015-12-03 20:01:35 +01:00
Gabriel Mazetto 82e916b0f2 Touch project when toggling stars to update cache 2015-12-03 16:08:08 -02:00
Douwe Maan f9d954fae7 Satisfy rubocop 2015-12-03 19:02:56 +01:00
Douwe Maan e41a0c60f4 Add missing milestone ID 2015-12-03 18:59:03 +01:00
Douwe Maan 494ebad39b Fix spec 2015-12-03 18:56:43 +01:00
Douwe Maan a89d6d1428 Add authorization to new branch/tag pages. 2015-12-03 18:53:17 +01:00
Douwe Maan 1dd7c97886 Fix background and padding of login and error pages 2015-12-03 18:51:44 +01:00
Douwe Maan 5ab1b11e90 Fix specs 2015-12-03 18:42:37 +01:00
Dmitriy Zaporozhets 76f0054220 Merge branch 'ui/issuable-list-item' into 'master'
UI: Issuable list item tweaks

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.37.40](/uploads/00ac22d131c49ce548bccd96866cbc75/Screen_Shot_2015-12-02_at_17.37.40.png)

After:

![merge_item_after](/uploads/201d742494596c50bbdb3626f06f65a8/merge_item_after.png)

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2590 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2589

See merge request !1962
2015-12-03 17:34:30 +00:00
Douwe Maan 0cbb7717df Fix spec 2015-12-03 18:32:29 +01:00
Dmitriy Zaporozhets d63d12a526 Merge branch 'ui/milestones' into 'master'
UI: Use new style for milestone detail page

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.47.03](/uploads/62441f50963e0c5d6d04b065573c05f0/Screen_Shot_2015-12-02_at_17.47.03.png)

After:

![Screen_Shot_2015-12-02_at_17.47.22](/uploads/ab29ac0c1819415cc647be173f8c92bd/Screen_Shot_2015-12-02_at_17.47.22.png)


See merge request !1966
2015-12-03 17:22:34 +00:00
Dmitriy Zaporozhets 68e27b5507 Merge branch 'ui/project-home-panel' into 'master'
UI: Project home panel tweaks

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.46.01](/uploads/f07a4f2370c6863a68df46f655b513c4/Screen_Shot_2015-12-02_at_17.46.01.png)

After:

![Screen_Shot_2015-12-02_at_17.45.40](/uploads/da9b19d3bd89b9421457e0df550efd6e/Screen_Shot_2015-12-02_at_17.45.40.png)


See merge request !1965
2015-12-03 17:20:55 +00:00