home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,830 Commits 48 Branches 340 Tags
cbe22c9ec360eed754944912ecea950d3bddba81
Commit Graph
1712 Commits
Author SHA1 Message Date
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
Jan-Willem van der Meer 5238efd80c Only return found LDAP groups for processing 2014-08-29 11:09:06 +02:00
Marin Jankovski e8da7b8077 Merge remote-tracking branch 'CE/master' 
Conflicts:
	doc/workflow/README.md
 2014-08-21 10:57:39 +02:00
Robert Schilling 66f6ca0770 Fix tests after #7526 2014-08-20 20:34:55 +02:00
Jacob Vosmaer 5812cfa10e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-08-20 17:14:26 +02:00
jubianchi 7ad93ab250 Improve labels validation and expose error messages 2014-08-20 12:09:19 +02:00
Robert SchillingandJacob Vosmaer 33c8c1cc0b Fix labels return code 2014-08-19 18:20:39 +02:00
Jacob Vosmaer 6dc24e3bcf Merge pull request #7527 from Razer6/api_labels_return_code 
API: Fix labels return code
 2014-08-18 17:16:32 +02:00
Jacob Vosmaer 7567614d3b Merge tag 'v7.2.0.rc1' 
Bump version to 7.2.0.rc1

Conflicts:
	VERSION
 2014-08-18 16:12:32 +02:00
Jacob Vosmaer 48a943e94a Merge branch 'merge_ce_27cf081e1b0b1df166' into 'master' 
Merge CE 27cf081e1b

See merge request !145
 2014-08-18 10:04:30 +00:00
Robert Schilling 4ca3f64719 Fix labels return code 2014-08-18 00:25:49 +02:00
Jan-Willem van der Meer c982a8f050 Add backwards compatibility for creating groups with a LDAP connection 2014-08-15 18:59:58 +02:00
Dmitriy Zaporozhets 86f6f5a96d Merge branch 'redmine-fix' 2014-08-15 17:48:01 +03:00
Jan-Willem van der Meer 27bebd5c3e Add ldap_group_links to groups api 2014-08-15 16:26:43 +02:00
Job van der Voort 0d9f8494a8 add tests to redmine integration improvement 2014-08-15 16:03:10 +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
Jan-Willem van der Meer 5ff230a11d Add more use cases for update_ldap_group_links to unit tests 2014-08-15 12:07:30 +02:00
Jan-Willem van der Meer 2541571014 Add unit test for update_ldap_group_links 
This is the first stage, need to add some other to test revoking and
upgrading of the permissions
 2014-08-15 11:31:52 +02:00
Dmitriy Zaporozhets 6063a1e6c1 Add labels api authorization. Update permission doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-15 11:59:19 +03: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
Dmitriy Zaporozhets 27cf081e1b Merge pull request #7479 from Razer6/feature/labels_api 
Implement complete labels API (create/delete/update)
 2014-08-15 10:25:48 +03:00
Dmitriy Zaporozhets 433dac7799 Merge pull request #7465 from Razer6/better_label_color_validation 
Better label color validation, fixes #7454
 2014-08-15 10:17:16 +03:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
Jan-Willem van der Meer bb93dfb2c8 Remove old code 2014-08-14 12:54:26 +02:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Jan-Willem van der Meer bf65eb1d4c Handle multiple LDAP groups 2014-08-14 09:33:40 +02:00
Dmitriy Zaporozhets 1d63464c82 Fix repository archive 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 21:28:22 +03:00
Jan-Willem van der Meer 6f71267e8f Make ldap_user more explicit in param 2014-08-13 16:51:21 +02:00
Jan-Willem van der Meer 673b9a373b Add method to get the current cns the user has access to 2014-08-13 16:48:36 +02:00
Dmitriy Zaporozhets 71f87ffb66 Merge pull request #6788 from CingleVue/master 
Patched `MergeRequest` to return more data.
 2014-08-13 16:47:51 +03:00
Dmitriy Zaporozhets dbb1cb30a3 Merge pull request #7441 from bbodenmiller/patch-7 
add git config --global core.autocrlf check
 2014-08-13 16:39:58 +03:00
Dmitriy Zaporozhets ffc284301e Merge branch 'ldap/cache_check' into 'master' 
Cache LDAP check everywhere

See merge request !1008
 2014-08-13 13:11:04 +00:00
Robert Schilling cf3ba0209d Update labels via API 2014-08-13 12:29:03 +02:00
Robert Schilling 9284038dbe Add, delete labels via API 2014-08-13 12:28:19 +02:00
Dmitriy Zaporozhets 4535db04b2 Increase import timeout from 2 to 4 minutes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 20:58:39 +03:00
Max Wippert c99f42ce71 fixed redmine<->gitlab integration 
- when a proect configures "Lightweight issue tracking system for this project"
  to be "Issues tracker" = "Redmine", Wiki-Markdown text like "lorem ipsum #123"
  should be rendered to a hyperlink to Redmine
- without this patch/enhancment this did not work
- internal bugtracker id = redmine 16693
 2014-08-11 14:35:20 +02:00
Dmitriy Zaporozhets f8eedb4cda Cleaner variable name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 15:25:25 +03:00
Dmitriy Zaporozhets 505203e7d5 Merge pull request #7466 from Razer6/improve_markup_handling 
Improve readme markup,  fixes #7455
 2014-08-11 13:02:24 +03:00
Dmitriy Zaporozhets 5b52d7b979 Merge branch 'add_complete_commit_message_to_api' of https://gitlab.com/christian.taedcke/gitlab-ce into christian.taedcke/gitlab-ce-add_complete_commit_message_to_api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-08-11 12:33:04 +03:00
Dmitriy Zaporozhets d10ecacc47 Merge branch 'master' into 'master' 
Let users limit by archived/not archived projects in GitLab API GET /projects

Adds a boolean parameter, archived, to the /projects endpoint.

See merge request !158
 2014-08-11 09:27:24 +00:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Dmitriy Zaporozhets e09ef2fc38 Merge branch 'improve-test-env' into 'master' 
Improve test env

* Replace big gitlabhq repo with small one (https://gitlab.com/gitlab-org/gitlab-test)
* dont stub gitlab-shell calls

Advantages:

* test gitlab-shell install during tests
* test integration with gitlab-shell features (fork, change default branch etc)
* don't store archive with test repo inside gitlab
* less stubs - easier to write/read tests

During this refactoring __next issues are be fixed__:

* satellite error if gitlab_shell path is relative
* project rename repo -> 500 error
* fixed wrong diff for MR `download plain diff`
* fixed bug when gfm ignores `@ref` variable during link parsing

Fixes #1451

See merge request !1005
 2014-08-09 17:51:31 +00:00
Jacob Vosmaer 22ad81e2b3 Fix copy-paste errors in LDAP::Access 2014-08-08 13:04:55 +02:00
Jacob Vosmaer 5629546794 Merge remote-tracking branch 'origin/master' into ldap/cache_check 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
 2014-08-06 18:09:07 +02:00
Jacob Vosmaer 82dc40936a Cache LDAP check in Gitlab::UserAccess 
This changes the number of LDAP calls when users access GitLab via
Git-over-SSH or the API. LDAP check results are cached for 1 hour.
 2014-08-06 18:03:01 +02:00
Jacob Vosmaer 669682686e Move LDAP timeout code to Gitlab::LDAP::Access 2014-08-06 18:03:01 +02:00
Dmitriy Zaporozhets 8f1e60b057 Fix satellite tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:52:56 +03:00
Ben Bodenmiller ecd33c9d92 add git config --global core.autocrlf check 
core.autocrlf was added to install guide in https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1 but not added to check script
 2014-08-04 20:41:20 -07:00
Sytse Sijbrandij 8aff39a6d0 Simplify the ssl setup file. 2014-08-04 15:57:59 +02:00
mabdullah-cinglevue d048a27771 Patched MergeRequest to return more data. 
Added milestone to merge_requests instead of milestone id.
 2014-08-01 18:41:09 +08:00