delta/gitlab/gitlab-ce.git/app/controllers/projects_controller.rb, branch commit-timeago-fix gitlab.com: gitlab-org/gitlab-ce.git Add method to return the user notification setting for a group, or a project 2016-04-08T21:46:45+00:00 Douglas Barbosa Alexandre dbalexandre@gmail.com 2016-04-08T20:35:21+00:00 635b65d1206293d0b92322df18d458447ee73d5a 






Use default_value_for to set default NotificationSetting#level
2016-04-08T20:24:27+00:00

Douglas Barbosa Alexandre
dbalexandre@gmail.com

2016-04-08T20:24:27+00:00

ee497599cc69b126cc2e4a929f1799d3d3eb989d












Merge branch 'master' into decouple-member-notification
2016-04-08T18:48:09+00:00

Douglas Barbosa Alexandre
dbalexandre@gmail.com

2016-04-08T18:48:09+00:00

7afeace35474249c9aeb898f3a56180745106169












Fix Error 500 after renaming a project path
2016-04-05T18:18:13+00:00

Stan Hu
stanhu@gmail.com

2016-04-04T21:59:54+00:00

934f1e9097485bbaebbe2759e995c77bb4391c5d

Closes #14885





Closes #14885







Merge branch 'fix_remove_fork_link' into 'master'

2016-04-04T15:37:08+00:00

Douwe Maan
douwe@gitlab.com

2016-04-04T15:37:08+00:00

f505c753b02a7a0b41cc42a85ac15017af4ed86f


Remove fork link closes all merge requests opened on source project

Currently, if you:

- create a fork
- open a merge request on the source project
- remove the fork link

The created MR cannot be closed.

With this MR, all pending MR is closed when the fork link is removed.

See merge request !3189





Remove fork link closes all merge requests opened on source project

Currently, if you:

- create a fork
- open a merge request on the source project
- remove the fork link

The created MR cannot be closed.

With this MR, all pending MR is closed when the fork link is removed.

See merge request !3189






Pre-calculate Emoji digests
2016-03-30T17:29:17+00:00

Yorick Peterse
yorickpeterse@gmail.com

2016-03-30T17:29:17+00:00

5830d80b8d2b87daa9123dc248ae00e2ed90069c

By pre-calculating the digests we can manually construct the emoji URLs,
removing the need for using Rails' asset URL helpers. The reason we
don't want to use these helpers for Emojis is two-fold:

1. Rails' image_url() method is slow, really slow. For one it _might_
   have to calculate digests but it also performs a lot of other
   intensive operations (judging by the source code and based on
   measuring timings).

2. We have a lot of Emoji which coupled with the above can result in it
   taking minutes to load Emoji autocomplete data.

Using this pre-calculation setup generating the digests takes around 7
seconds (including the time it takes to start Rails/Rake), and only
around 600 milliseconds to load _all_ the autocomplete data of a project
(measured locally).

This commit _does_ change the Emoji URLs from absolute to relative URLs
as these are much easier to generate.

To update the Emoji data simply run:

    rake gemojione:digests

Then commit any changes.

Fixes gitlab-org/gitlab-ce#14009





By pre-calculating the digests we can manually construct the emoji URLs,
removing the need for using Rails' asset URL helpers. The reason we
don't want to use these helpers for Emojis is two-fold:

1. Rails' image_url() method is slow, really slow. For one it _might_
   have to calculate digests but it also performs a lot of other
   intensive operations (judging by the source code and based on
   measuring timings).

2. We have a lot of Emoji which coupled with the above can result in it
   taking minutes to load Emoji autocomplete data.

Using this pre-calculation setup generating the digests takes around 7
seconds (including the time it takes to start Rails/Rake), and only
around 600 milliseconds to load _all_ the autocomplete data of a project
(measured locally).

This commit _does_ change the Emoji URLs from absolute to relative URLs
as these are much easier to generate.

To update the Emoji data simply run:

    rake gemojione:digests

Then commit any changes.

Fixes gitlab-org/gitlab-ce#14009







Create NotificationSettings object only when user change value in dropdown
2016-03-30T08:44:20+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-03-29T15:42:38+00:00

5583197e091e8f75ad9c99a1bbc46e6a0b7279d4

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





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







Refactor creating notification setting with defaults
2016-03-30T08:44:20+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-03-29T11:52:42+00:00

71e7b398431506c8bac2e8e6014b0f3891a41f95

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





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







Introduce NotificationSetting to user interface
2016-03-30T08:44:20+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-03-28T16:17:42+00:00

359157c097993a9b917ca590e128e85cf358d95d

* visiting project will create notification setting if missing
* change notification setting per project even without membership
* use notification settings instead of membership on profile page

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





* visiting project will create notification setting if missing
* change notification setting per project even without membership
* use notification settings instead of membership on profile page

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







Move unlink fork logic to a service
2016-03-22T14:34:35+00:00

Baldinof
baldinof@gmail.com

2016-03-22T14:34:35+00:00

fa4126acffdfe13741e05a60ad5ed7fd407b4f16