home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,693 Commits 48 Branches 340 Tags
1deccc561d814cb7dfe7e4e5476c66bf3cec423d
Commit Graph
211 Commits
Author SHA1 Message Date
Valery Sizov e3df22f224 Merge remote-tracking branch 'dev/master' into ce_upstream1 2015-03-12 18:39:24 +02:00
Dmitriy Zaporozhets be4d340381 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb
 2015-03-11 18:41:41 -07: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
Dmitriy Zaporozhets 811505c7ce Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/views/groups/members.html.haml
 2015-03-03 13:33:40 -08:00
Douwe Maan 3702c4ad80 Render go-import meta tag for private repos. 2015-03-03 11:22:30 +01:00
Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb
 2015-03-02 16:10:12 -08: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
Dmitriy Zaporozhets 976e18bb33 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre 
Conflicts:
	app/views/groups/show.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
 2015-02-23 23:56:59 -08: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 29611a245d Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	GITLAB_SHELL_VERSION
	VERSION
	lib/api/entities.rb
	lib/api/groups.rb
 2015-02-18 17:44:29 -08: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
Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb
 2015-02-16 11:50:30 -08: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
Valery Sizov 615c5e171e MR rebase by default 2015-02-12 14:20:23 +02:00
Douwe Maan 9910b7ff99 Allow groups to be mentioned. 
Resolves #1673.
 2015-02-05 19:10:52 +01:00
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08: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
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
 2014-12-26 15:05:43 +02:00
skv-headless c4a56797a4 transfer error handler 2014-12-15 16:10:56 +03:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02: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 3bd66989de Merge branch 'master' into ee-master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
 2014-12-05 13:28:32 +02: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
Marin Jankovski bd2a29a878 Add option of rebasing before merging. 2014-11-28 10:02:55 +01: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
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +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
Ciro Santilli b011052ce7 Remove unused authenticate_user from project#show 
Redundant with the authorize_read_project! filter
 2014-10-19 11:46:57 +02:00
Vinnie Okada 5700842ba8 Add Markdown preview to more forms 
Enable Markdown previews when creating and editing issues, merge
requests, and milestones, and when editing notes.
 2014-10-15 23:52:33 -05:00
Ciro Santilli a22d4cebb0 Remove unused filter from ProjectsController 
Neither controller nor any of it's descendants have those actions.
 2014-10-13 21:24:42 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Kevin Boyd 893bd8acec Incorporating Dmitriy's referrer-based routing suggestion 2014-09-05 22:35:46 +00:00
Kevin Boyd 75b0ef82ba Fine-tune the Remove Project redirect. Now it redirects to admin_projects_path and shows a flash message confirming the action has been taken. 2014-08-29 15:56:26 -07:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00