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
9,643 Commits 48 Branches 340 Tags
ab032256da9f24351871143058343f7463f9d7fc
Commit Graph
1433 Commits
Author SHA1 Message Date
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 5880d7df62 Docs for merge api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-12 18:01:22 +03:00
Dmitriy Zaporozhets 0c73e66643 Specify error codes for merge api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-12 17:51:43 +03:00
Dmitriy Zaporozhets fe6d392236 Draft API method for merge MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-12 16:34:41 +03:00
Jacob Vosmaer 0f29ccffd2 Backup wiki repo even if the main repo is empty 
This fixes a bug where wiki repositories for projects with an empty main
repository would not get backed up.
 2014-05-08 22:50:48 +02:00
Dmitriy Zaporozhets 32875f9aaf Merge pull request #6937 from chamill/master 
Provide fallback for missing `name` value.
 2014-05-08 21:49:59 +03:00
Dmitriy Zaporozhets cb20ab0201 Merge pull request #6929 from asedge/fix_api_branches_with_periods 
Add fix for API when branch names have periods in them.  Relates to issu...
 2014-05-08 21:22:13 +03:00
Jacob Vosmaer da347d1bb4 Apply the locale encoding to tar --version 
Fixes a bug with non-UTF8 locales introduced by
2b816075dc.
 2014-05-08 18:23:44 +02:00
C. Morgan Hamill 0456101117 Clean up conditional statement in name method. 
Reverse the conditional order to avoid awkward `if !` construction.
 2014-05-08 09:23:17 -04:00
Sean Edge da9b009d31 Add fix for API when branch names have periods in them. Relates to issue #6128 (https://github.com/gitlabhq/gitlabhq/issues/6128). 2014-05-08 07:06:47 -04:00
C. Morgan Hamill a45f7262f9 Clean up of name fallback code. 
Don't use `unless` for the conditional.
Avoid double-quotes where possible.
 2014-05-07 16:41:35 -04:00
C. Morgan Hamill 9e805b7754 Provide fallback for missing name value. 
If `auth.info.name` is `nil`, then use `auth.info.first_name + auth.info.last_name`
as the value of `name`.
 2014-05-07 16:33:54 -04:00
Dmitriy Zaporozhets 4fea8afc4b Add CompareAction class for collecting commits and diffs using satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-07 16:14:24 +03:00
Dmitriy Zaporozhets fd7a221cca Change gitlab:test task 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-06 09:07:15 +03:00
Dmitriy Zaporozhets cac916d974 Clean working directory in satellite 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-05 14:21:00 +03:00
Dmitriy Zaporozhets 87c397f577 More fixes to gitlab:shell:install 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 14:13:45 +03:00
Dmitriy Zaporozhets dd47f9532f Fix gitlab-shell setup rake task 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-02 13:46:32 +03:00
Dmitriy Zaporozhets 85b5d203ac Merge branch 'improve-gitlab-shell-installation' of https://github.com/pkgr/gitlabhq into pkgr-improve-gitlab-shell-installation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/install/installation.md
 2014-05-02 13:30:26 +03:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview 
editing preview
 2014-04-29 10:00:29 +03:00
Jacob Vosmaer b4b6447b55 Merge pull request #6857 from bytheway/master 
Add scoping to ldap lookup when only dn given
 2014-04-25 10:48:28 +02:00
Dmitriy Zaporozhets 2eaca54536 Add rake setup alias for gitlab:setup 2014-04-24 19:53:00 +02:00
Dmitriy Zaporozhets 2a99f18478 Merge branch 'mysql_field_limits' into 'master' 
Adjust MySQL limits for existing installations
 2014-04-24 17:37:38 +00:00
Ben Bytheway de794b6a77 Add scoping to ldap lookup when only dn given 2014-04-23 21:00:56 -06:00
Jacob Vosmaer b810ef1099 Merge branch 'bump_gitlab_shell' into 'master' 
Bump gitlab shell
 2014-04-23 09:20:33 +00:00
Jacob Vosmaer 77e565d347 Bump the required gitlab-shell version to 1.9.3 2014-04-23 11:13:21 +02:00
Jacob Vosmaer cd61239540 Move the adapter check to the migration 2014-04-23 11:08:51 +02:00
Jacob Vosmaer 43e77099d8 Adjust MySQL limits for existing installations 2014-04-23 11:07:36 +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
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04:00
Dmitriy Zaporozhets 448e5c133a Merge branch 'satellite_exists_in_automerge_check' into 'master' 
Satellite exists in automerge check
 2014-04-14 13:21:49 +00: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
Dmitriy Zaporozhets 481bbd7534 Merge pull request #6766 from jvanbaarsen/split-test-even-further 
Split feature tests out to different build job
 2014-04-13 20:07:53 +03:00
Dmitriy Zaporozhets 156465cedd Merge pull request #6747 from mrts/expose-event-and-mergerequest-timestamps-in-api 
Expose event and mergerequest timestamps in API
 2014-04-13 20:06:43 +03:00
Jeroen van Baarsen 8362026a33 Split feature tests out to different build job 2014-04-13 19:05:52 +02:00
Dmitriy Zaporozhets 5f9592e4b0 Merge pull request #6405 from awiddersheim/fix_space_in_commit_message 
Fix extra space added in beginning of commit message
 2014-04-13 20:04:25 +03:00
Jeroen van Baarsen 5dd2f36ae1 Added API testing group 2014-04-11 21:45:56 +02:00
Jeroen van Baarsen 25eadf0c5b Proposal for split testing 2014-04-11 13:37:33 +02:00
Marin Jankovski aa6426f46d Satellite will exist when doing automerge_check. 2014-04-11 10:22:32 +02:00
Mart Sõmermaa 0da8428f8e Expose event and and mergerequest timestamps in API, make code more DRY. 2014-04-10 20:24:20 +03:00
Dmitriy Zaporozhets f23dcac91b Merge branch 'ensure_satellite_exists' into 'master' 
Ensure satellite exists instead of raising an error
 2014-04-09 17:50:26 +00:00
Marin Jankovski 63ba983511 Dont raise an error with satellites, make sure it exists. 2014-04-09 17:13:44 +02: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
Cyril Rohr 301c4068e1 Add rake task to install or upgrade gitlab-shell installation. 2014-04-08 15:12:18 +01:00
Dmitriy Zaporozhets 665a69941b Revert "Allow to parse heroku-generated database.yml config file." 
This reverts commit 8a56e7db48.
Because it actually breaks db setup for mysql
 2014-04-08 14:05:57 +03:00
Dmitriy Zaporozhets c4ef7f06a1 Merge pull request #6717 from pkgr/fix-database-parsing-gitlab-setup 
Allow to parse heroku-generated database.yml config file.
 2014-04-08 09:30:08 +03:00
Dmitriy Zaporozhets fefa10c3c2 Merge branch 'breack-attack' into 'master' 
Breack attack

Fixes #1104
 2014-04-07 15:48:45 +00:00
Dmitriy Zaporozhets 5307dd5f74 Comment gzip: off be default 2014-04-07 15:47:20 +00:00
Cyril Rohr 8a56e7db48 Allow to parse heroku-generated database.yml config file. 2014-04-07 15:48:51 +01: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 650d0bc695 Merge branch 'improve-oauth' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-04-07 17:15:31 +03:00