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
12,431 Commits 48 Branches 340 Tags
e151bbbb285c8eafe4fe8aff06d225fef71e520e
Commit Graph
1378 Commits
Author SHA1 Message Date
Jan-Willem van der Meer 0e276f9cbf Move allowed call to LDAP::User 2014-10-03 17:27:14 +02:00
Jan-Willem van der Meer d9355ea590 Allow proper provider_name for ldap provider 2014-10-03 14:00:28 +02:00
Jan-Willem van der Meer 97aa12fcc8 Dynamically initiate LDAP strategies 2014-10-02 12:45:53 +02:00
Jan-Willem van der Meer 3a358005e4 Merge branch 'feature-refactor-oauth-instance-methods' into feature-multi-ldap-servers 2014-10-01 17:33:50 +02:00
Jan-Willem van der Meer ad1c2f79d9 Refactor Gitlab::LDAP::User to instance methods 2014-10-01 14:11:50 +02:00
Marin Jankovski 383825145f Add ability to remove the branded page logo. 2014-09-26 14:52:11 +02:00
Dmitriy Zaporozhets c24f9cb651 Merge branch 'merge-79190fe06b-7.3.0-pre' into 'master' 
Merge 79190fe06b (7.3.0-pre) and serialize_service_properties

This combines two merges because each individual merge breaks the build on its own.

See merge request !175
 2014-09-16 09:43:58 +00:00
Jacob Vosmaer f13bcb2b45 Fix LdapGroupLink error message 
ActiveModel::Validations has an 'errors' attribute, but no 'error'.
 2014-09-15 14:26:26 +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
Robert Schilling 37a274a568 update tags count if tag gets deleted 2014-09-12 07:35:57 +02:00
Jan-Willem van der Meer e45861d7d9 Display multiple LDAP servers on login page 2014-09-11 16:14:54 +02:00
Dmitriy Zaporozhets 17fd28468e Merge branch 'project-destroy-redirect' into 'master' 
Redirect users to Projects Admin Page after removing a project

Fixes issue #543 by redirecting the user to "admin_projects_path" and displaying the flash alert "Project removed."

See merge request !178
 2014-09-11 06:45:52 +00:00
Dmitriy Zaporozhets 638331d05a Merge branch 'parallel_diff_refactor' into 'master' 
Parallel diff refactor

Refactor side-by-side diff to remove code duplication.

Base the side-by-side diff on inline diff code.

In first iteration:

1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code

See merge request !1066
 2014-09-09 13:57:50 +00:00
Dmitriy Zaporozhets 0e78d00bcb Merge pull request #7695 from coverer/search_wiki 
Added search wiki feature
 2014-09-09 16:50:43 +03:00
Dmitriy Zaporozhets 9e4a40982e Merge pull request #7646 from bushong1/snippet-search3 
Adding in snippet search functionality
 2014-09-09 10:31:21 +03:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:27:12 +03:00
Ralf Seidler 23241c181c Fixed houndci complaining over too long lines 2014-09-06 11:46:14 +02:00
Kevin Boyd 893bd8acec Incorporating Dmitriy's referrer-based routing suggestion 2014-09-05 22:35:46 +00:00
Charles Bushong 858dbd0842 Updating to persist a params snippets variable 2014-09-05 13:30:55 -04:00
Dmitriy Zaporozhets 60a98584f6 Merge pull request #7658 from Razer6/refresh_labels_page_on_delete 
Show labels help message if last label is deleted
 2014-09-05 14:39:40 +03:00
Ralf Seidler d93b046c4c Added search wiki feature 2014-09-05 13:36:43 +02:00
Robert Schilling bd2355191f Show labels help message if last label is deleted 2014-09-04 23:15:28 +02:00
Sean Edge 468b2e8e0b Added annotated tags. Updated tag haml file and call to gitlab-shell. Updated API for annotated tags. Added tests for API. Strip leading/trailing whitespace from message, if present. Update CHANGELOG. 2014-09-04 09:47:20 -04:00
Jan-Willem van der Meer efafbd1746 Respond with the error message on failure 2014-09-04 11:02:14 +02:00
Robert Schilling 392113919a Validate tag-names and references in WebUI, API 2014-09-03 13:08:36 +02:00
Robert Schilling 551145bc98 Validate branch-names and references in WebUI, API 
Add specs for GitRefValidator
 2014-09-03 13:08:35 +02:00
Jacob Vosmaer 6a3c694a19 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups 2014-09-02 09:59:00 +02:00
Jan-Willem van der Meer bac04b220b admin group edits now redirect to group#show on success 2014-09-01 10:05:37 +02:00
Jan-Willem van der Meer 89f25ffae7 Render correct layout, css fix empty state of ldap links 
Fixes #157
 2014-09-01 09:25:10 +02: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
Charles Bushong 4cca1b050a Adding in snippet search functionality 
http://feedback.gitlab.com/forums/176466-general/suggestions/5529795-search-though-snippets
 2014-08-29 15:32:07 -04:00
Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups 
Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb
 2014-08-29 14:43:20 +02:00
Dmitriy Zaporozhets 01520d5d77 Dont allow edit or remove of system notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 15:19:35 +03:00
Dmitriy Zaporozhets 6f154c07c8 Prevent possible XSS issues by seting text/plain for all text files in 
RAW feature

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 10:42:52 +03:00
Dmitriy Zaporozhets 8b00d01c67 Search by issue/mr title and description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:47:30 +03:00
Dmitriy Zaporozhets 0cbf478808 Merge branch 'unsubscribed_email' into 'master' 
Unsubscribed email and doc update

Fixes #152

/cc @jacobvosmaer @job @sytse

See merge request !159
 2014-08-27 07:39:13 +00:00
Dmitriy Zaporozhets ede08dbdd7 Implement search page with filtering of results and pagination 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 09:57:50 +03:00
Marin Jankovski 4b71ae37dd Send email notifying user he has been unsubscribed. 2014-08-26 17:15:43 +02:00
Marin Jankovski 72139167dc Mockup of shared group memeber list at project member page. 2014-08-26 11:58:05 +02:00
Marin Jankovski 9ba563f357 Use base 64 encoding for email params. 2014-08-22 10:51:33 +02:00
Jeroen van Baarsen 1b14864549 Set charset encoding to UTF-8 for snippets 
Fixes #2678

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-08-16 14:58:53 +02:00
Jan-Willem van der Meer 3ba7a3a5ca Remove traces from ldab_cn and ldap_access 
Also add notes about refactoring the old single-ldap API and LdapGroupResetService
 2014-08-15 12:33:05 +02: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
Jan-Willem van der Meer e519963876 Refactor group/edit LDAP sync page 2014-08-14 17:52:28 +02:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
Jan-Willem van der Meer 08fda6a263 Add missing ldap_group_links controller 2014-08-14 13:18:32 +02:00
Dmitriy Zaporozhets fdd8e45075 Merge branch 'remove-remove-label' into 'master' 
Remove labels via ajax

See merge request !1019
 2014-08-13 18:28:52 +00:00
Dmitriy Zaporozhets 1d63464c82 Fix repository archive 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 21:28:22 +03:00
Dmitriy Zaporozhets 540596b7b5 Remove labels with ajax request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 19:47:03 +03:00