Commit Graph
214 Commits
Author SHA1 Message Date
Douwe Maan 47e926bec0 Minor code cleanup 2015-09-20 19:09:43 +02:00
Patricio Cano 23f9a64566 Use the find_by_user_id magic finder instead of where. 2015-09-16 21:02:40 -05:00
Patricio Cano 1ef2ce95d5 Merge branch 'master' into notification-levels 2015-09-16 19:52:57 -05:00
Patricio Cano 01cc20378b Notification dropdown now shows currently active level, and also shows what the actual value of global is, if the project has the notification level set to global. 2015-09-14 20:33:24 -05:00
Patricio Cano adcae6ebd5 Notification level can now be saved from within the project view. 2015-09-14 19:27:54 -05:00
Darby 84508c40b7 PAtrially working notification button 2015-09-14 16:37:11 -07:00
Douwe Maan f87f6480b2 Use new routing helper 2015-09-08 17:53:16 +01:00
Douwe Maan 1489d225d6 Move partial to right place and fix tests. 2015-09-08 15:14:14 +01:00
Douwe Maan 5d785457db Clean up overlap between dashboard and explore.
- Split up SnippetsController into separate dashboard and explore sections.
- Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
2015-09-08 14:49:20 +01:00
Achilleas Pipinellis 0fac66f84d Mention group and project name in flash messages upon create, update and delete. 2015-07-30 01:22:16 +03:00
Valery Sizov c61e7dd4ac Public project activity page asks for sign-in 2015-07-20 13:54:56 +03:00
Douwe MaanandRobert Speicher b93053695a Fix transferring of project to another group using the API. 2015-07-11 16:47:33 -04:00
Dmitriy Zaporozhets f0e1da04f0 Show last push widget on several project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 23:21:35 +02:00
Dmitriy Zaporozhets c2f02fc1a4 Refactor star and fork buttons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 12:25:34 +02:00
Dmitriy Zaporozhets d192f921c1 Move project activity to separate tab. Add more features to project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-07 16:01:12 +02:00
Douwe Maan 4ae67fcaef Show warning when a comment will add 10 or more people to the discussion. 2015-06-05 12:07:13 +02:00
Dmitriy Zaporozhets 97ff86e07c Move repository when project is removed
Ths commit does next:

* When we remove project we move repository to path+deleted.git
* Then we schedule removal of path+deleted with sidekiq
* If repository move failed we abort project removal

This should help us with NFS issue when project get removed but
repository stayed. The full explanation of problem is below:

* rm -rf project.git
* rm -rf removes project.git/objects/foo
* NFS server renames foo to foo.nfsXXXX because some NFS client (think
* Unicorn) still has the file open
* rm -rf exits, but project.git/objects/foo.nfsXXX still exists
* Unicorn closes the file, the NFS client closes the file (foo), and the
* NFS server removes foo.nfsXXX
* the directory project.git/objects/ still exists => problem

So now we move repository and even if repository removal failed

Repository directory is moved so no bugs with project removed but
repository directory taken. User still able to create new project with
same name. From administrator perspective you can easily find stalled
repositories by searching `*+deleted.git`

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-03 13:05:43 +02:00
Douwe Maan 92fd3ccee0 Add helpers for header title and sidebar, and move setting those from controllers to layouts. 2015-05-01 10:39:16 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Douwe Maan a6dfd065ca Add atom feed for project activity. 2015-04-23 17:11:39 +02:00
Jeroen van Baarsen 5a4ebfb47a Fixed the Rails/ActionFilter cop
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
Dmitriy Zaporozhets d2d709a252 Update html-pipeline and emoji 2015-03-11 16:05:01 -07:00
Dmitriy Zaporozhets 4b1bb42bf7 Fix tests for project removing 2015-03-10 21:56:19 -07:00
Douwe Maan 3702c4ad80 Render go-import meta tag for private repos. 2015-03-03 11:22:30 +01:00
Dmitriy Zaporozhets 1da71cc520 Introduce shortcuts for routing helpers 2015-02-25 19:34:16 -08:00
Douwe Maan 5f7a3e1bbd Merge branch 'master' into extend_markdown_upload
# Conflicts:
#	app/controllers/files_controller.rb
2015-02-25 11:59:25 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
2015-02-24 14:54:39 +01:00
DJ Mountney 746dd89ab0 Fix 404 when deleting a project
The deletion from the admin section was redirecting to the wrong address.
2015-02-23 16:19:03 -08:00
Douwe Maan 218283b368 Merge branch 'extend_markdown_upload' into generic-uploads
# Conflicts:
#	app/controllers/files_controller.rb
#	app/controllers/projects/uploads_controller.rb
#	app/uploaders/attachment_uploader.rb
2015-02-20 15:37:37 +01:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets 63f11a68c5 Fix event loading with associations 2015-02-18 09:38:46 -08:00
Dmitriy Zaporozhets a8a328b151 DB performance improvements to GitLab 2015-02-18 00:16:42 -08:00
Douwe Maan d2ebdf664b Refactor. 2015-02-17 22:23:31 +01:00
Hannes RosenöggerandDouwe Maan 9bf8480b4a Generalize the image upload in markdown
This commit generalizes the image upload via drag and drop so it supports all files.
It also adds access control for these files.
2015-02-17 22:20:44 +01:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Douwe Maan 9910b7ff99 Allow groups to be mentioned.
Resolves #1673.
2015-02-05 19:10:52 +01:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Dmitriy Zaporozhets 893a68baf3 Cache autocomplete or emojis 2015-01-23 16:17:27 -08:00
Dmitriy Zaporozhets a42d84eca3 Faster autocomplete without unused description 2015-01-23 14:38:20 -08:00
Dmitriy Zaporozhets 1511999d88 Faster autocomplete for users/issues/emojiis
Instead of loading all issues and merge requests we load only open one.
This will reduce time load for autocomplete resources significantly
2015-01-22 17:51:35 -08:00
skv-headless c4a56797a4 transfer error handler 2014-12-15 16:10:56 +03:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview
Conflicts:
	spec/routing/project_routing_spec.rb
2014-12-07 20:25:58 -07:00
Dmitriy Zaporozhets 9d93729313 Move projects import to separate resource. Add bare repo creation to repository controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-30 00:50:25 +02:00
Dmitriy Zaporozhets 674cbe939c Dont allow project creation without repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-29 21:34:18 +02:00
Dmitriy Zaporozhets e08e405ac4 Select namespace where to fork project
Now you can fork project into group or personal namespace.
Also I moved fork logic from ProjectsController to own fork resource

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-13 22:06:19 +02:00
Dmitriy Zaporozhets c3e83d4771 Merge branch 'auth_duplication' into 'master'
Remove unnecessary authorisations

Because we already check read_project ability in `before_filter :project`

See merge request !1240
2014-11-05 15:23:26 +00:00
Valeriy Sizov f9814bf288 Merge pull request #8094 from cirosantilli/rm-unused-authenticate_user
Remove unused authenticate_user from project#show
2014-11-05 16:31:11 +02:00
Valery Sizov 6f34d40436 remove auth duplication 2014-11-05 11:04:08 +02:00
Dmitriy Zaporozhets c36a9e4cbf Merge pull request #8029 from cirosantilli/rm-projects-controller-filter
Remove unused filter from ProjectsController
2014-10-21 11:58:08 +03:00
Ciro Santilli 9e1b97ad99 Use @project on controllers, don't call method
Also memoize the method to ensure that other methods in
ApplicationController that rely on it can call it efficiently.
2014-10-19 23:36:23 +02:00