home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,827 Commits 48 Branches 340 Tags
23bcb9cb0d294611c3bcd1b453dd67ee73d50dff
Commit Graph
1368 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 1bb9aeb565 Fix specs. Fix note form reset after submit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-24 14:10:36 +03:00
Dmitriy Zaporozhets d575ee3e90 Improve branch deletion via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 15:34:02 +03:00
Earle Bunao & Neil Calabrosoanderbunao 6a85cdf162 Implements drag and drop upload in creating issues 2014-05-23 16:22:42 +08:00
Dmitriy Zaporozhets ebe2a34a6b Add missing feature flag to mr notes spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 22:44:32 +03: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
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
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
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
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 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 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
Dmitriy Zaporozhets 53b52b11d5 Merge pull request #6699 from criteo/api_get_open_merge_requests 
Add optional parameter to list merge requests
 2014-04-13 20:10:39 +03:00
Jeroen van Baarsen 8362026a33 Split feature tests out to different build job 2014-04-13 19:05:52 +02:00
GitLab bb7df7663a Add short path route for groups. 2014-04-13 17:46:41 +02:00
Dmitriy Zaporozhets 0f31acd0ec Merge pull request #6753 from jvanbaarsen/split_tests 
Proposal for split testing
 2014-04-11 22:54:49 +03:00
Jeroen van Baarsen 5dd2f36ae1 Added API testing group 2014-04-11 21:45:56 +02:00
Jeroen van Baarsen 28f1a5d7d8 Determine label color based on lowercase name 2014-04-11 19:06:27 +02:00
Jonathan A. Sternberg 9cb2a4ac8a Fix emails on push service when a single commit is pushed 
This fixes issue #161.
 2014-04-11 11:54:02 -04:00
Jeroen van Baarsen 25eadf0c5b Proposal for split testing 2014-04-11 13:37:33 +02:00
Dmitriy Zaporozhets 89ecb19126 Merge branch 'ensure_default_fields' into 'master' 
Add values to default fields to prevent 500 error when migrate from MySQL to Postgres
 2014-04-10 07:20:45 +00:00
Hiroyuki Sato bca528a57c Better title format for wiki page 
The title format for wiki page may be unintelligible.
For example 'GitLab' is converted to 'Git Lab', 'MySQL' is converted to
'My Sql', etc.
 2014-04-10 15:14:02 +09:00
Dmitriy Zaporozhets 36f861f1b1 Re-annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 15:05:03 +03:00
Dmitriy Zaporozhets 1bd28994cc Use ProjectWiki instead of GollumWiki in code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:58 +03:00
Dmitriy Zaporozhets 684877acc4 Fix test broken by 89c942908c 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-08 15:58:28 +03:00
Stuart Pook 66209fbc76 Add optional parameter to list merge requests 
Add an optional parameter to list merge requests to restrict the
returned merge requests to those that are "opened", "merged" or
"closed". By default all merge requests are returned. Note that
"all" can be given to explicitly request all merge requests.
 2014-04-07 16:18:25 +02:00
Dmitriy Zaporozhets 021faad3fe Add nickname to oauth_spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:03:05 +03:00