Commit Graph

263 Commits

Author SHA1 Message Date
Douglas Barbosa Alexandre 635b65d120 Add method to return the user notification setting for a group, or a project 2016-04-08 18:46:45 -03:00
Douglas Barbosa Alexandre ee497599cc Use default_value_for to set default NotificationSetting#level 2016-04-08 17:24:27 -03:00
Douglas Barbosa Alexandre 7afeace354 Merge branch 'master' into decouple-member-notification 2016-04-08 15:48:09 -03:00
Stan Hu 934f1e9097 Fix Error 500 after renaming a project path
Closes #14885
2016-04-05 11:18:13 -07:00
Douwe Maan f505c753b0 Merge branch 'fix_remove_fork_link' into 'master'
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
2016-04-04 15:37:08 +00:00
Yorick Peterse 5830d80b8d Pre-calculate Emoji digests
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
2016-03-30 19:29:17 +02:00
Dmitriy Zaporozhets 5583197e09 Create NotificationSettings object only when user change value in dropdown
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 71e7b39843 Refactor creating notification setting with defaults
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets 359157c097 Introduce NotificationSetting to user interface
* 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>
2016-03-30 10:44:20 +02:00
Baldinof fa4126acff Move unlink fork logic to a service 2016-03-22 15:34:35 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Douglas Barbosa Alexandre 7ee528336a Restrict access for confidential issues on autocomplete 2016-03-17 20:55:59 -03:00
Jacob Vosmaer 30b36c92c3 Use an exception to pass messages 2016-03-15 11:03:43 +01:00
Baldinof 436caf4e8b Merge branch 'master' into fix_remove_fork_link 2016-03-14 21:51:06 +01:00
Jacob Vosmaer a02fe251df Allow project housekeeping only once an hour 2016-03-14 15:55:45 +01:00
Stan Hu 74d7de8196 Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""
This reverts commit 5a586f364c
2016-03-12 21:05:23 +00:00
Douwe Maan 5a586f364c Revert "Merge branch 'support-go-subpackages' into 'master' "
This reverts merge request !3191
2016-03-12 17:42:51 +00:00
Stan Hu 2563213ccf Remove existing go_import.html.haml implementation 2016-03-12 07:49:16 -08:00
Baldinof e8c723543c Close merge requests when removing fork relation 2016-03-11 21:37:57 +01:00
Robert Speicher fe13f58f3e Update Emoji asset path
Now that we're serving assets directly from the Gemojione gem's path,
the images are not in an `emoji/` sub-folder.
2016-02-12 15:34:20 -05:00
Kamil Trzcinski b4c36130cc Rename allow_guest_to_access_builds to public_builds 2016-02-04 12:57:46 +01:00
Kamil Trzcinski 627909c2a4 Add CI setting: allow_guest_to_access_builds
Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
2016-02-02 17:59:37 +01:00
Josh Frye 91b9cbff8d First pass at deleting projects in the background. 2016-01-29 09:14:16 -05:00
Jeroen Nijhof 9b28220f88 Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-06 14:55:44 +01:00
Douwe Maan 43a3a401bd Merge branch 'master' into mention-all 2015-12-24 20:34:19 +01:00
Douwe Maan 672cbbff95 Only allow group/project members to mention `@all` 2015-12-24 15:33:51 +01:00
Jacob Schatz 011a7a3297 adds starring and unstarring text to star button, also adds partial new styles 2015-12-23 12:26:50 -05:00
Kamil Trzcinski 513d551c8f Fix after column rename 2015-12-11 18:02:10 +01:00
Kamil Trzcinski e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00
Stan Hu 2497d3d550 Fix 404 in redirection after removing a project
Closes https://github.com/gitlabhq/gitlabhq/issues/9844

Closes #3559
2015-11-25 23:11:35 -08:00
Jeroen Nijhof d4690af8bc Use GitlabShellWorker.perform_async for housekeeping 2015-11-19 16:04:07 +01:00
Jeroen Nijhof 839aae0e47 Added housekeeping status and moved path check to gitlab-shell 2015-11-19 15:16:54 +01:00
Marin Jankovski 14032d8eb1 Add support for git lfs. 2015-11-16 12:39:13 +01:00
Kamil Trzcinski 6384c757b7 Expose CI enable option in project features
- Enable CI by default for all new projects
2015-11-13 10:52:50 +01:00
KON YUICHI 31723eb9f0 fix deprecated 2015-10-31 22:32:06 +09:00
kazubu 0bfb9cbf38 modify to use redirect_back_or_default function 2015-10-26 15:06:55 +09:00
kazubu c3d48f9735 Fix: 500 error returned if destroy request without HTTP referer 2015-10-26 15:06:55 +09:00
Jeroen Nijhof 4f0a38f1a8 Added housekeeping for git repositories 2015-10-21 15:15:54 +02:00
Douwe Maan f9cd0639c1 Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-button
[ci skip]
2015-10-19 13:49:52 +02:00
Douwe Maan 157d891615 Add changelog item 2015-10-19 11:40:13 +02:00
Douwe Maan 8adeda37b5 Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into 'master'
Add ability to remove the fork relationship from project settings

![Screen_Shot_2015-10-18_at_12.37.24](/uploads/676571642a4c90f7f286280d714599a3/Screen_Shot_2015-10-18_at_12.37.24.png)
![Screen_Shot_2015-10-18_at_12.37.28](/uploads/1a069ecfc4cd3b5438772a9c3f04b6fc/Screen_Shot_2015-10-18_at_12.37.28.png)

Replaces !1579.

Fixes #2578.

See merge request !1636
2015-10-19 09:32:07 +00:00
Douwe Maan 42cbc7f813 Tweak wording. 2015-10-18 12:38:01 +02:00
Douwe Maan 99b8568ff7 Find correct group membership. 2015-10-18 12:19:30 +02:00
Douwe Maan ff866faf2f Only load tree when project has repository to prevent 404 2015-10-18 11:22:33 +02:00
Douwe Maan 6bd9a9fbf7 Set vars used by tree view in project show action. 2015-10-17 19:16:40 +02:00
Han Loong Liauw 0bea5ced8b Made suggested content changes based on MR Review
Changed the authentication method for removing fork through API
Reflected changes to new auth method in API specs
2015-10-14 20:19:41 +11:00
Han Loong Liauw df99ddbba1 Adds ability to remove the forked relationship
This was previously possible through the API but can now be done
through the project#edit settings screen if the current user is
the owner of the project.
Update changelog
2015-10-13 21:42:17 +11:00
Grzegorz Bizon b8f5e7427f Show notifications button even if user is not member of a project
Notifications button was unavailable if user wasn't member of the
project, even if protected project is available via group privileges.

Showing disabled button with explanation tool-tip is less confusing.

This closes #2846.
2015-10-12 12:07:31 +02:00
Cristian Bica c528043439 Allow users to select the Files view as default project view 2015-10-01 17:05:20 +03:00
Douwe Maan 47e926bec0 Minor code cleanup 2015-09-20 19:09:43 +02:00