home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,213 Commits 48 Branches 340 Tags
e2cd20cc723fed41d3dc2c696f94f9d117fc4174
Commit Graph
1411 Commits
Author SHA1 Message Date
Jacob Vosmaer 834b23a750 Fix JIRA issue reference bug 2014-06-13 18:24:30 +02:00
Dmitriy Zaporozhets f1d3289690 Merge branch 'master' of gitlab.com:subscribers/gitlab-ee 2014-06-13 18:12:40 +03:00
Jacob Vosmaer 83f01ab558 Test #issues_sentence with JiraIssues 2014-06-13 15:40:33 +02:00
Jacob Vosmaer 978162bb8a Add a test for issue sentence generation 2014-06-13 15:40:33 +02:00
Jacob Vosmaer 2ab1363c75 Test if JiraIssues make it through #issues_for 2014-06-13 15:40:33 +02:00
Jacob Vosmaer 68048e3009 Feed a JiraIssue to JiraService in its spec 2014-06-13 15:40:32 +02:00
Jacob Vosmaer 873127d6d0 Return JiraIssues in ReferenceExtractor#issues_for 2014-06-13 15:40:21 +02:00
Jacob Vosmaer d4ae3e4d82 Add a JiraIssue class 2014-06-13 15:40:09 +02:00
Marvin Frick d448f40763 removes api credentials from link to build_page 
Also adds a spec for MergeRequestHelper to avoid having a regression
later on.
 2014-06-11 12:41:14 +02:00
Marin Jankovski 7ab468317b Merge branch 'ldap_email_downcase' into 'master' 
Fix LDAP email upper case bug
 2014-05-22 06:59:13 +00:00
Jacob Vosmaer 4ce8287e02 Add failing spec for upper case LDAP emails 2014-05-21 13:51:58 +02:00
Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb
 2014-05-21 13:10:37 +02:00
Jacob Vosmaer 2d8c310f11 Make user access test pass for the right reason 
If we do not set a private token during the test, current_user will be
nil because the user is not found, not due to the access check.
 2014-05-15 10:30:50 +02:00
Jacob Vosmaer 02b85fd236 Check user access status in API for current_user 2014-05-15 10:22:59 +02:00
Jacob Vosmaer 6d45909f03 Add test for current behavior of current_user 2014-05-15 09:57:21 +02:00
Jacob Vosmaer be1120e968 Improve ad_disabled method name 2014-05-14 19:13:06 +02:00
Jacob Vosmaer d54133b09f Add spec for LDAP::Access#allowed? 2014-05-14 18:26:49 +02:00
Jacob Vosmaer 982d4d51e8 Backport Adapter#dn_matches_filter? from EE 2014-05-14 18:11:14 +02:00
Marin JankovskiandDmitriy Zaporozhets bb89661365 Better name for config variable. 2014-05-13 15:34:00 +03:00
Marin JankovskiandDmitriy Zaporozhets 6b04a5f910 Add support for Jira ticket mentions in format JIRA-123. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
 2014-05-13 15:33:38 +03:00
Marin Jankovski e2d4ee91bd Add tests and documentation for jira service. 2014-05-13 13:48:55 +02:00
Dmitriy Zaporozhets 1f1c59b61d Merge pull request #6778 from dblessing/feature/mr_labels 
Merge Request Labels
 2014-05-13 14:43:46 +03:00
Drew Blessing 5f25cdfe19 Implement Merge Request Labels 2014-05-13 06:41:36 -05:00
Dmitriy Zaporozhets 0c62170865 Merge branch 'api-mr-merge' into 'master' 
Accept merge request API

This MR adds new endpoint `PUT /projects/:id/merge_request/:merge_request_id/merge`. After this change you can merge branches using API.

Fixes internal issue #1166
 2014-05-13 11:27:19 +00:00
Dmitriy Zaporozhets 2d2b2da45a More tests for merge api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 13:20:10 +03:00
Dmitriy Zaporozhets 17858d49f6 Merge pull request #6109 from jamit/master 
Added email threading for update emails on issues and merge requests
 2014-05-13 12:35:33 +03:00
Dmitriy Zaporozhets 0fd12a786a Merge pull request #6825 from sue445/feature/post_automerge 
Fix can not automerge when description is too long
 2014-05-13 12:26:42 +03:00
Dmitriy Zaporozhets ab032256da Add some tests for merge API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 11:01:40 +03:00
Dmitriy Zaporozhets 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml
 2014-05-12 12:39:51 +03:00
Alex 31b0e14981 Adding project visibility to system hooks 2014-05-12 10:23:24 +01:00
sue445 a3d8be09c6 Fix can not automerge if description is too long 2014-05-11 23:50:14 +09:00
Dmitriy Zaporozhets 3b34084bde Fix notify specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-09 09:46:23 +03:00
Marin Jankovski 32eb647c5c Better name for config variable. 2014-05-07 12:09:05 +02:00
Marin Jankovski 7bc054ec8a Add support for Jira ticket mentions in format JIRA-123. 2014-05-06 19:51:56 +02:00
Philip Blatter a7bdf87f43 Added some tests. 2014-05-05 21:50:03 +02:00
Jacob Vosmaer 285926918b Serialize last_fetched_at as a string with seconds 2014-04-28 12:42:01 +02:00
Jacob Vosmaer bbfa4a771a Always set last_fetched_at in NotesFinder spec 2014-04-28 12:16:34 +02:00
Jacob Vosmaer 0b615eb0e2 Filter out old notes in NotesFinder 2014-04-28 12:13:29 +02:00
Jacob Vosmaer 7339464e77 Fail faster on an invalid target_type 2014-04-28 11:55:13 +02:00
Jacob Vosmaer e5cf5f4f98 Notes have noteables but no commits 2014-04-28 11:50:21 +02:00
Jacob Vosmaer 410790a355 Add NotesFinder spec 2014-04-28 11:48:18 +02:00
Marin Jankovski fe1ca61601 Make sure that tests pass when aws group is used. 2014-04-24 13:23:17 +02:00
Dmitriy Zaporozhets c4e713a5b6 Merge remote-tracking branch 'origin/master' into 6-8-ce-to-ee 
Conflicts:
	VERSION
	db/schema.rb
	doc/install/installation.md
 2014-04-22 11:58:11 +02:00
Timm Friebe 05e792b4c4 Implement GET /users/:uid/keys for admin users 
Complements POST operation added in gitlabhq/gitlabhq#3146

Implement DELETE /users/:uid/keys/:id for admin users

Fix "Line is too long. [83/80]"

Use single quotes as advised

Use single quotes as advised

Use single quotes as advised

Fix missing space around { and }

Fix typo in documentation

Only catch  ActiveRecord::RecordNotFound, let other exceptions propagate

Raise a "404 Not found" if key to be deleted cannot be found
As requested by @jvanbaarsen in https://github.com/gitlabhq/gitlabhq/pull/6781#discussion_r11735114

Remove tab
Unconfigured vim on this box, grrrr./
 2014-04-18 14:16:19 +02:00
Dmitriy Zaporozhets eff30fff08 Improve dn_matches_filter method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-15 17:27:59 +03:00
Dmitriy Zaporozhets fd61e3e901 Merge branch 'routing-for-groups' into 'master' 
Routing for groups

Implements http://feedback.gitlab.com/forums/176466-general/suggestions/5723800-group-url-on-root-path-groups-name-instead-of-g
 2014-04-15 10:36:52 +00:00
GitLab 61ef72e5d1 Fixes to group route tests, thanks DZ 2014-04-15 10:40:37 +02:00
Dmitriy Zaporozhets cfa7e24b33 Use last appearance settings. Show last edit date 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:51 +03:00
Dmitriy Zaporozhets 28e6e1b1ab Merge branch '161-emails-on-push-service' of https://gitlab.com/jsternberg/gitlab-ce into jsternberg/gitlab-ce-161-emails-on-push-service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-04-14 09:27:11 +03:00
Dmitriy Zaporozhets 352bb97266 Merge pull request #6731 from hiroponz/better-title-format-for-wiki-page 
Better title format for wiki page
 2014-04-13 20:13:02 +03:00