summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Avoid instantiation of a Git::Treeavoid-instantiate-tree-for-projects-show-readme-viewPaco Guzman2016-06-291-1/+6
| | | Only needed when the project view is ‘Files view’
* Provide default branch/file path for ProjectsController#show18709-reduce-git-callsPaco Guzman2016-06-201-1/+7
|
* Fixed issue with returning ref in commits JSONasync-refs-dropdownPhil Hughes2016-06-201-3/+3
| | | | Added tests to project controller
* Fixed Ruby to use excludePhil Hughes2016-06-181-1/+1
|
* Correctly adds commit ID into dropdownPhil Hughes2016-06-181-8/+6
| | | | | Removes un-used method Fixes other Ruby issues
* Pulls back tags if any existPhil Hughes2016-06-181-2/+6
|
* Tests fix for ref switcherPhil Hughes2016-06-181-1/+1
|
* Refs dropdown is now loaded asyncPhil Hughes2016-06-181-0/+16
|
* Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-171-1/+43
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export project functionality This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects. - [x] members - DB data - [x] issues - [x] issue comments - [x] merge requests - [x] merge request diff - [x] merge request comments - [x] labels - [x] milestones - [x] snippets - [x] releases - [x] events - [x] commit statuses - [x] CI builds - File system data - [x] Git repository - [x] wiki - [x] uploads - [ ] ~~CI build traces~~ - [ ] ~~CI build artifacts~~ - [ ] ~~LFS objects~~ - DB configuration - [x] services - [x] web hooks - [x] protected branches - [x] deploy keys - [x] CI variables - [x] CI triggers See merge request !3114
| * a few changes based on MR feedbackJames Lopez2016-06-171-6/+12
| |
| * lots of refactoring again based on feedback. Changed the UI slightly and ↵James Lopez2016-06-151-8/+23
| | | | | | | | also fixed a small bug
| * project export archiverJames Lopez2016-06-141-3/+1
| |
| * adding notifications stuff and more refactoring for exporting projectsJames Lopez2016-06-141-1/+1
| |
| * lots of refactoring to reuse import serviceJames Lopez2016-06-141-1/+1
| |
| * Merge branches 'feature/project-export-ui-experimental' and ↵James Lopez2016-06-131-12/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental # Conflicts: # Gemfile.lock # app/helpers/todos_helper.rb # app/models/todo.rb # app/views/projects/edit.html.haml # lib/gitlab/import_export/import_service.rb
| * | updated controllers with permissions checkJames Lopez2016-05-131-1/+1
| | |
| * | use worker in controllerJames Lopez2016-05-041-3/+6
| | |
| * | few fixes - import from UI workingJames Lopez2016-04-281-1/+3
| | |
| * | Merge branches 'feature/project-export' and 'feature/project-import' into ↵James Lopez2016-04-221-4/+8
| |\ \ | | | | | | | | | | | | feature/project-export-ui-experimental
| * | | download export now workingJames Lopez2016-04-151-1/+10
| | | |
| * | | some experimental UI stuff to test exportJames Lopez2016-04-141-0/+9
| | | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-06-141-12/+8
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | add_autocomplete_for_labels # Conflicts: # app/assets/javascripts/gfm_auto_complete.js.coffee
| * | | Allow or not merge MR with failed buildRui Anderson2016-06-101-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | 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 gfm autocomplete for labelsArinde Eniola2016-05-031-0/+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
| | |