home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 21:16:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,924 Commits 48 Branches 340 Tags
f07b26fcefdf363fc97a495e83aeb8351bbcd8bc
Commit Graph
255 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html
 2015-05-15 13:29:58 +03:00
Douwe Maan cd52cef1c0 Fix reference links in dashboard activity and ATOM feeds. 2015-05-14 13:05:33 +02:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Jakub Jirutka 44b82396d1 Add spec for RelativeLinkFilter 2015-05-12 02:12:47 +02:00
Dmitriy Zaporozhets 6c32abc5f7 Merge branch 'rs-task_list' into 'master' 
Use task_list gem for task lists

Task Lists can now be used in comments, and they'll render in previews. 👏

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271

See merge request !599
 2015-05-08 09:39:48 +00:00
Robert Speicher 6883e6e084 Remove all references to parse_tasks 2015-05-06 12:58:28 -04:00
Alex Lossent affd049dc4 Improve handling of large diffs 
Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.

https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab.
This patch re-introduces a safe limit on number of lines.
 2015-05-05 18:51:12 +02:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02:00
Robert Speicher 84a7675ea6 Remove title_for_issue helper 2015-04-30 17:27:33 -04:00
Robert Speicher fad015764c More gitlab_markdown_helper_spec cleanup 2015-04-30 16:35:26 -04:00
Robert Speicher e46d1cdd8b Add Gitlab::Markdown::SanitizationFilter 
This just extends the HTML::Pipeline::SanitizationFilter with our custom
whitelist.
 2015-04-30 16:35:25 -04:00
Robert Speicher 382a0aa6ef Add Gitlab::Markdown::TableOfContentsFilter 
Removes header and table of contents processing from Redcarpet renderer.
 2015-04-30 16:35:25 -04:00
Robert Speicher 1ccb912f65 Fix MergeRequestsHelper spec 
Also, there was a file called `spec/helpers/merge_requests_helper` that
was never being run because it didn't end in `_spec`. This consolidates
that file's tests into the correct spec file.
 2015-04-28 17:13:46 -04:00
Dmitriy Zaporozhets 9f443f4257 Merge branch 'fix-relative-submodule-links-with-personal-projects' into 'master' 
Fix broken file browsing with relative submodule in personal projects

Git submodules with relative links work fine for projects in groups but not in personal projects. This patch fixes this issue.

To reproduce the problem, go here:

https://gitlab.com/andrewwu.tw/submodule-test/tree/master

Closes https://github.com/gitlabhq/gitlabhq/issues/7554

See merge request !565
 2015-04-27 14:23:01 +00:00
Dmitriy Zaporozhets 2e243fc321 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	README.md
	VERSION
	app/controllers/projects/services_controller.rb
	app/controllers/projects/uploads_controller.rb
	app/services/test_hook_service.rb
	db/schema.rb
	features/steps/admin/settings.rb
	lib/gitlab/reference_extractor.rb
	spec/models/note_spec.rb
 2015-04-27 11:53:31 +03:00
Vinnie Okada bd557e4b64 Add new admin settings 
Add new global application settings for default project and snippet
visibility levels.
 2015-04-26 07:48:19 -06:00
Douwe Maan 8ed7ac9d44 Use project.commit convenience method. 2015-04-24 12:29:36 +02:00
Dmitriy Zaporozhets f502b293e5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	spec/helpers/gitlab_markdown_helper_spec.rb
 2015-04-24 11:22:54 +03:00
Stan Hu 9a2e3d3d81 Fix broken file browsing with relative submodule in personal projects 
Closes https://github.com/gitlabhq/gitlabhq/issues/7554
 2015-04-23 07:42:28 -07:00
Dmitriy Zaporozhets 0e0325ee99 Merge branch 'rs-issue-2257' into 'master' 
Recover from URI::Error

`URI::Error` is the base class for all URI errors.

Fixes #2257 and #2260

See merge request !1789
 2015-04-22 13:04:46 +00:00
Robert Speicher c917b26f41 Recover from all URI::Errors 
Fixes #2257
Fixes #2260
 2015-04-21 22:02:44 -04:00
Robert Speicher 870969a1b2 More cleanup of gitlab_markdown_helper_spec 2015-04-21 13:12:19 -04:00
Robert Speicher f9c0f0782b Use Nokogiri in link_to_gfm specs 
Didn't like relying so much on Regex matches
 2015-04-21 12:53:42 -04:00
Robert Speicher fca624670a Update Gitlab::Markdown to use the 🆕 EmojiFilter ✨ 
Removes emoji-centric tests from GFM specs 💥
 2015-04-21 12:53:42 -04:00
Robert Speicher 470b0c2508 Remove more now-invalid specs 2015-04-20 13:01:44 -04:00
Robert Speicher 4d3a634ece Fix broken spec 2015-04-20 13:01:44 -04:00
Robert Speicher b41eb34503 Re-arrange spec/helpers/gitlab_markdown_helper_spec a bit 2015-04-20 13:01:44 -04:00
Robert Speicher f76df89058 Begin cleaning out spec/helpers/gitlab_markdown_helper_spec 2015-04-20 13:01:44 -04:00
Robert Speicher d520fe07ad Fix GitlabMarkdownHelper spec 2015-04-20 13:01:42 -04:00
Robert Speicher 96c2b94048 Reference filters ✨ 
Commit ranges, commits, external issues, issues, labels, merge requests,
snippets, users.
 2015-04-20 13:01:42 -04:00
Dmitriy Zaporozhets d01d0c02b7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb
 2015-04-15 19:22:57 +03:00
Dmitriy Zaporozhets ef8d96e5de Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	app/assets/javascripts/dispatcher.js.coffee
	app/controllers/help_controller.rb
	app/models/user.rb
	app/views/groups/group_members/_new_group_member.html.haml
	config/gitlab.yml.example
	config/routes.rb
	features/groups.feature
	features/steps/dashboard/help.rb
 2015-04-14 15:08:19 +03:00
Dmitriy Zaporozhets 9311f86291 Merge branch 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/api.js.coffee
	app/assets/javascripts/users_select.js.coffee
 2015-04-14 13:05:39 +03:00
Dmitriy Zaporozhets 4632983c8c Merge branch 'rs-link-to-performance' into 'master' 
Speed up the overridden `link_to` helper

Only bothers to check the provided link's external status if it's a String that doesn't begin with a path or anchor character.

See merge request !1767
 2015-04-14 07:33:09 +00:00
Dmitriy Zaporozhets ecb58dacd6 Merge branch 'reference-access-control' into 'master' 
Only allow users to reference groups, projects, issues, MRs, commits they have access to.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183.

See merge request !1742
 2015-04-13 14:10:25 +00:00
Robert Speicher 975f1e6ec8 Speed up the overridden link_to helper 
Only bothers to check the provided link's external status if it's a
String that doesn't begin with a path or anchor character.
 2015-04-12 17:48:28 -04:00
Stan Hu 7d089701f1 Fix broken file browsing with a submodule that has a relative link 
Closes #775
 2015-04-09 22:10:59 -07:00
Douwe Maan c5d7660000 Fix errors. 2015-04-02 22:36:54 +02:00
Robert Speicher 6ab8275cd1 Check symlink mode as a String for file_type_icon_class 
See https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
 2015-04-01 23:34:33 -04:00
Marin Jankovski 96d093e59a Merge branch 'email-full-url' 2015-03-31 19:00:59 -07:00
Sullivan SENECHAL 8ef7220c23 Improve file icons rendering on tree 2015-03-28 16:49:05 +01:00
Douwe Maan e08d947e77 Use relative URL for Markdown references, except in mails. 2015-03-27 10:39:05 +01:00
Douwe Maan c5de2ce742 Return full URLs from GitLabIssueTrackerService. 2015-03-27 10:39:05 +01:00
Dmitriy Zaporozhets 3840549566 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb
 2015-03-25 09:16:09 -07:00
Vinnie Okada 057c8c344b Merge branch 'master' into markdown-tags 2015-03-24 20:03:22 -06:00
Vinnie Okada 1dc90fc455 Fix nested task lists 
When nesting task list items, the parent item is wrapped in a `<p>` tag.
Update the task list parser to handle these paragraph wrappers.
 2015-03-21 08:45:28 -06:00
Vinnie Okada feeffc4426 Merge branch 'master' into markdown-tags 
Use the latest HTML pipeline gem
 2015-03-17 20:53:09 -06:00
Dmitriy Zaporozhets d3361e6d1b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/application_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/team_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/helpers/projects_helper.rb
	app/helpers/tab_helper.rb
	app/models/application_setting.rb
	app/models/user.rb
	app/views/devise/shared/_signin_box.html.haml
	app/views/groups/projects.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/projects/team_members/_form.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
	db/schema.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2015-03-16 21:25:00 -07:00
Douwe Maan 31fc73f0a9 Use project_member instead of team_member. 2015-03-15 13:50:38 +01:00
Dmitriy Zaporozhets bf0c04e5ff Fix specs 2015-03-12 14:51:41 -07:00