summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-031-2/+2
|\
| * Split Markdown rendering & reference gatheringYorick Peterse2016-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | This splits the Markdown rendering and reference extraction phases into two distinct code bases. The reference extraction phase no longer relies on the html-pipeline Gem (and any related code) and allows for extracting of references from multiple HTML nodes in a single pass. This means that if you want to extract user references from 200 comments you no longer need to run 200 times N number of queries, instead only a handful of queries may be needed.
* | Merge branch 'master' into awardablesZJ van de Weg2016-05-251-7/+2
|\ \ | |/
| * Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' Douwe Maan2016-05-201-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement special GitLab markdown reference for milestones https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions: - Move changelog item to 8.8 - Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829 See merge request !3897
| | * Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable2016-05-181-1/+2
| | |\ | | | | | | | | | | | | | | | | | | | | eReGeBe/gitlab-ce-feature/milestone-md Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | Implementing autocomplete for GFM milestone referencesAlejandro Rodríguez2016-04-201-0/+1
| | | |
| * | | Improve documentation and add changelogFelipe Artur2016-05-171-5/+1
| | | |
| * | | Let users set notification levels in projects which they are not membersFelipe Artur2016-05-171-3/+1
| | |/ | |/|
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
| * | Rename `images` to `container_registry`Kamil Trzcinski2016-05-091-1/+1
| | |
| * | Make images_enabled configurableKamil Trzcinski2016-04-291-1/+2
| |/
* | Create table for award emojiZeger-Jan van de Weg2016-05-061-1/+1
|/
* Add method to return the user notification setting for a group, or a projectDouglas Barbosa Alexandre2016-04-081-1/+1
|
* Use default_value_for to set default NotificationSetting#levelDouglas Barbosa Alexandre2016-04-081-1/+0
|
* Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-081-13/+5
|\
| * Fix Error 500 after renaming a project pathStan Hu2016-04-051-0/+3
| | | | | | | | Closes #14885
| * Merge branch 'fix_remove_fork_link' into 'master' Douwe Maan2016-04-041-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Move unlink fork logic to a serviceBaldinof2016-03-221-1/+1
| | |
| | * Merge branch 'master' into fix_remove_fork_linkBaldinof2016-03-141-11/+0
| | |\
| | * | Close merge requests when removing fork relationBaldinof2016-03-111-1/+1
| | | |
| * | | Pre-calculate Emoji digestsprecompile-emoji-urlsYorick Peterse2016-03-301-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 dropdownDmitriy Zaporozhets2016-03-301-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Refactor creating notification setting with defaultsDmitriy Zaporozhets2016-03-301-6/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Introduce NotificationSetting to user interfaceDmitriy Zaporozhets2016-03-301-4/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | * 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>
* | | Tweaks, refactoring, and specsDouwe Maan2016-03-201-2/+2
| | |
* | | Restrict access for confidential issues on autocompleteDouglas Barbosa Alexandre2016-03-171-1/+1
| | |
* | | Use an exception to pass messagesJacob Vosmaer2016-03-151-5/+10
| | |
* | | Allow project housekeeping only once an hourJacob Vosmaer2016-03-141-2/+2
| |/ |/|
* | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-121-11/+0
| | | | | | This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5
* | Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-121-0/+11
| | | | | | This reverts merge request !3191
* | Remove existing go_import.html.haml implementationStan Hu2016-03-121-11/+0
|/
* Update Emoji asset pathRobert Speicher2016-02-121-1/+1
| | | | | Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder.
* Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-041-1/+1
|
* Add CI setting: allow_guest_to_access_buildsKamil Trzcinski2016-02-021-0/+1
| | | | Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
* First pass at deleting projects in the background.Josh Frye2016-01-291-2/+6
|
* Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-061-13/+9
|\
| * Merge branch 'master' into mention-allDouwe Maan2015-12-241-1/+1
| |\
| | * adds starring and unstarring text to star button, also adds partial new stylesJacob Schatz2015-12-231-1/+1
| | |
| * | Only allow group/project members to mention `@all`Douwe Maan2015-12-241-1/+1
| |/
| * Fix after column renameKamil Trzcinski2015-12-111-1/+1
| |
| * Migrate CI::Project to ProjectKamil Trzcinski2015-12-111-2/+2
| |
| * Fix 404 in redirection after removing a projectStan Hu2015-11-251-1/+1
| | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9844 Closes #3559
| * Add support for git lfs.lfsMarin Jankovski2015-11-161-3/+2
| |
| * Expose CI enable option in project featuresKamil Trzcinski2015-11-131-1/+2
| | | | | | | | - Enable CI by default for all new projects
| * fix deprecatedKON YUICHI2015-10-311-1/+1
| |
| * modify to use redirect_back_or_default functionkazubu2015-10-261-5/+1
| |
| * Fix: 500 error returned if destroy request without HTTP refererkazubu2015-10-261-1/+1
| |
* | Use GitlabShellWorker.perform_async for housekeepingJeroen Nijhof2015-11-191-6/+2
| |
* | Added housekeeping status and moved path check to gitlab-shellJeroen Nijhof2015-11-191-2/+7
| |
* | Added housekeeping for git repositoriesJeroen Nijhof2015-10-211-0/+8
|/
View Lorry Controller Status