Commit Graph
21159 Commits
Author SHA1 Message Date
Douwe Maan 507fdb4b2b Use consistent padding in panel heading 2015-12-08 13:06:52 +01:00
Douwe Maan c64a881a40 Allow center top menu to span multiple lines 2015-12-08 13:06:52 +01:00
Douwe Maan f5430e48b4 Merge branch 'rs-validators' into 'master'
Add more custom validators

These custom validators allow us to DRY up our models a bit.

See merge request !1944
2015-12-08 08:42:17 +00:00
Douwe Maan 1d605f6365 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 08:36:23 +00:00
Valery Sizov 7f90c8efcc Merge branch 'gemfile_fix' into 'master'
Add explicit reference to rouge 1.10.1

We are relying on rouge 1.10.1 but nothing is referencing to this version and it is easy to lose this dependence. Previously, it was updated directly in Gemfile.lock which is not reliable way :)

https://gitlab.com/gitlab-org/gitlab-ce/commit/e20529cec4f6de0c2c1589da99abb8714ea1c1c1

`gollum-lib` has a dependence `rouge 1.9` which is old for us.

See merge request !1937
2015-12-08 07:49:07 +00:00
Valery Sizov 2e270c0705 add explicit reference to rouge 1.10.1 2015-12-08 09:05:02 +02:00
Douglas Barbosa Alexandre f7aafd8fc8 Merge branch 'master' into fix-merge-request-that-removes-submodule 2015-12-07 22:41:18 -02:00
Dmitriy Zaporozhets e02940e329 Merge branch 'fix-random-test' into 'master'
Fix random failing test - delete attachment

Make sure we wait for AJAX request to finish before end test and cleanup
database

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

cc @rspeicher @DouweM 

Fixes #3885 

See merge request !2007
2015-12-08 00:02:40 +00:00
Dmitriy Zaporozhets bdb4945dcf Fix random failing test - delete attachment
Make sure we wait for AJAX request to finish before end test and cleanup
database

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-07 23:40:17 +01:00
Robert Speicher 2379c8beea Inline Gitlab::Blacklist in NamespaceValidator 2015-12-07 16:57:26 -05:00
Robert Speicher 175f482c3c Add custom NamespaceNameValidator 2015-12-07 16:57:26 -05:00
Robert Speicher 9321d382bd Add custom NamespaceValidator 2015-12-07 16:57:26 -05:00
Robert Speicher ad6a771dc6 Add custom LineCodeValidator 2015-12-07 16:57:26 -05:00
Robert Speicher 96e51a0304 Minor EmailValidator refactor 2015-12-07 16:57:26 -05:00
Robert Speicher e48391b813 Add custom ColorValidator 2015-12-07 16:57:26 -05:00
Robert Speicher b3200c8c44 Move EmailValidator to app/validators 2015-12-07 16:57:26 -05:00
Robert Speicher d5ea93469b Add custom UrlValidator 2015-12-07 16:57:26 -05:00
Robert Speicher 2928e19d43 Merge branch 'rs-spec-failure' into 'master'
Fix spec failure introduced by 9d03bc6fa3

See merge request !2006
2015-12-07 21:52:47 +00:00
Robert Speicher a1d3b8d7fa Fix spec failure introduced by 9d03bc6fa3 2015-12-07 16:50:20 -05:00
Dmitriy Zaporozhets 24ab860554 Merge branch 'fix-random-failing-test' into 'master'
Fix random failing test

Make sure we wait till page reloads after request was merged. Otherwise
we get request running which fails next test

Improvement for !1897

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

See merge request !2004
2015-12-07 20:55:22 +00:00
Robert Speicher 9d03bc6fa3 Merge branch 'pberndt:master' into 'master'
Fix #3758: Serious performance issues due to timeago()
being called n*(n+1)/2 times instead of n

See bug #3758 for a description. This merge request alters 
`time_ago_with_tooltip` to invoke the `timeago()` javascript on the
current timestamp only, instead of each one defined on the page so far.

See merge request !1977
2015-12-07 20:01:39 +00:00
Dmitriy Zaporozhets 2e074500b2 Merge branch 'fix-parallel-merge' into 'master'
Dont use cached collection for Repository find_branch and find_tag methods

Fix for #3816 

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

See merge request !2003
2015-12-07 19:53:30 +00:00
Dmitriy Zaporozhets 949a7e8e20 Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ce 2015-12-07 20:17:29 +01:00
Dmitriy Zaporozhets 74d73bd953 Fix random failing test
Make sure we wait till page reloads after request was merged. Otherwise
we get request running which fails next test

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-07 20:09:30 +01:00
Dmitriy Zaporozhets c823e85d15 Merge branch 'add_assign_to_me' into 'master'
Filter current user to top of assignee list in issues/merge requests

### What does this MR do?

Fixes #2076

Filter the current user to the top of the assignee list in issues and merge requests. This makes it fast/easy for a user to assign themselves without compromising the UI. This is the same thing we do in the filter select boxes in other places.

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

No.

### Why was this MR needed?

Users requested the feature in #2076



See merge request !1493
2015-12-07 19:00:40 +00:00
Dmitriy Zaporozhets 168b3e973f Merge branch 'fix-api-private-project-update' into 'master'
Fix API setting of 'public' attribute to false will make a project private

There is a bug in the projects API where setting `public` to `false` of  would not change `visibility_level` even if `visiblity_level` were not present.

Closes #3864

See merge request !1996
2015-12-07 18:56:40 +00:00
Dmitriy Zaporozhets 815cec3ea7 Merge branch 'minimize-readme' into 'master'
Move release cycle comments to the documentation.



See merge request !1995
2015-12-07 18:55:27 +00:00
Dmitriy Zaporozhets 1da71fa9ed Merge branch 'feature/sidekiq-cron' into 'master'
Migrate from Sidetiq to Sidekiq-cron

Migrate from Sidetiq to Sidekiq-cron
Updated Sidekiq to 3.5.x

This will solve #2355

See merge request !1982
2015-12-07 18:53:59 +00:00
Dmitriy Zaporozhets 2cec90254f Dont use cached collection for Repository find_branch and find_tag methods
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-07 19:37:05 +01:00
Kamil Trzciński 24c7eafb29 Merge branch 'fix-docker-syntax' into 'master'
Update Docker Syntax

I think this documentation is using an out-of-date docker client. I guess that `-n` means `--name` (there is no `-n` in up-to-date docker) and `-l` means `--link` (`-l` is short for `--label` now).

See merge request !2001
2015-12-07 16:21:56 +00:00
Michael A. Smith 8a0507d523 Update Docker Syntax 2015-12-07 10:29:55 -05:00
Douglas Barbosa Alexandre 7d836a0c0a Merge branch 'master' into fix-merge-request-that-removes-submodule 2015-12-07 13:09:01 -02:00
Valery Sizov bd5fb1b479 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:43:13 +00:00
Valery Sizov 3c97cbc74c fixes after review 2015-12-07 15:13:06 +02:00
Stan Hu e88fd58671 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-12-07 05:10:34 -08:00
Jacob Vosmaer b899436248 Merge pull request #9892 from stetskevych/fix_nginx_ssl_config
Fix gitlab-ssl nginx config to work when multiple server_names are served over https
2015-12-07 14:03:33 +01:00
Douwe Maan a468bf346a Merge branch 'gsmethells/gitlab-ce-sort-by-due-date' 2015-12-07 13:45:16 +01:00
Douwe Maan ff08ce9ca4 Satisfy Rubocop 2015-12-07 13:45:00 +01:00
Grzegorz Bizon 359d94607c 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 12:26:56 +00:00
Valery Sizov 5df2c4419c fox specs 2015-12-07 14:14:35 +02:00
Douwe Maan 104df74f51 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 11:45:10 +00:00
Douwe Maan 4c353143d6 Merge branch 'style-warning-about-mentioning-many-people-in-a-comment' into 'master'
Style warning about mentioning many people in a comment

Fixes #2885 

* Create issue:

    Before:

    ![Screenshot_2015-12-03_15.23.44](/uploads/6da9b326e47dc5e8c127a581af99403c/Screenshot_2015-12-03_15.23.44.png)

    After:

    ![Screenshot_2015-12-03_15.21.29](/uploads/bbe328d30a32d642c280bf2ad6d2832c/Screenshot_2015-12-03_15.21.29.png)  
    &nbsp; 

* New merge request:

    Before:

    ![Screenshot_2015-12-03_15.24.06](/uploads/79d6f8f52ba2753aaecf6b6bbd04f0d0/Screenshot_2015-12-03_15.24.06.png)

    After:

    ![Screenshot_2015-12-03_15.21.48](/uploads/f01ea8e7d058a9f8b803ca1ce4f533ad/Screenshot_2015-12-03_15.21.48.png)
    &nbsp;

* New comment in a merge request:

    Before:

    ![Screenshot_2015-12-03_15.11.23](/uploads/5d958375812d21d41e00694186c7ef7a/Screenshot_2015-12-03_15.11.23.png)

    After:

    ![Screenshot_2015-12-03_15.09.08](/uploads/3d6bde6aad46c7d9e53b70a47eecf7c0/Screenshot_2015-12-03_15.09.08.png)
    &nbsp;

* New diff comment:

    Before:

    ![Screenshot_2015-12-03_15.25.50](/uploads/08ac9c261c1aa9693706da714c121e15/Screenshot_2015-12-03_15.25.50.png)

    After:

    ![Screenshot_2015-12-03_15.46.20](/uploads/07a8b8708ad825eb8cda7e5e40116b81/Screenshot_2015-12-03_15.46.20.png)

See merge request !1971
2015-12-07 11:09:13 +00:00
Douwe Maan 839a8b9249 Move changelog item 2015-12-07 12:07:40 +01:00
Douwe Maan 6368717852 Merge branch 'issue_1156' 2015-12-07 12:07:22 +01:00
Douwe Maan f5ec1ebe2c Remove changelog entry issue number 2015-12-07 12:07:13 +01:00
Douwe Maan 0bca65b283 Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-date 2015-12-07 12:03:34 +01:00
Grzegorz Bizon 893d08c0dc Simplify contains_emoji_only? method in Note 2015-12-07 11:00:03 +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