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,464 Commits 48 Branches 340 Tags
7ec5ff4dbae71d147f413da5cea64116e7eb305d
Commit Graph
1410 Commits
Author SHA1 Message Date
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
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
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
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
Dmitriy Zaporozhets e6f58cb87d Avoid false validation when create user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:47:37 +03:00
Dmitriy Zaporozhets 5436d6afd6 Make oauth works for google oauth too 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:36:33 +03:00
Dmitriy Zaporozhets a73df4f72d Allow oauth signup without email 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 14:09:29 +03:00
Jacob Vosmaer bcfd9386f5 Fix popen bug in rake gitlab:satellites:create 
The Satellite#create method no longer sets the `$?` global variable.
Instead, we can use the method return value to test if the satellite was
created successfully
 2014-04-07 11:22:27 +02:00
Dmitriy Zaporozhets 5350492842 Fix support for force_push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 15:03:45 +03:00
Dmitriy Zaporozhets 207f34b890 Merge pull request #6190 from Popl7/add-better-branch-protection-against-history-rewrite-and-deletion 
protect protected branched to force updates
 2014-04-03 14:33:34 +03:00
Dmitriy Zaporozhets 563fec7349 Disable compression to prevent BREACH attack 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 13:03:16 +03:00
Dmitriy Zaporozhets 9ee697dd68 Use MergeRequest services in API and controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:51:53 +03:00
Dmitriy Zaporozhets 3faa14e7a7 Merge branch 'reduce-observers' into 'master' 
Move issue create/update code to services

Reduce observers role in GitLab code
 2014-04-02 17:54:27 +00:00
Marin Jankovski 03b8dcce87 Change the satellites directory permission in the install guide, add to rake check task. 2014-04-02 15:25:26 +02:00
Dmitriy Zaporozhets c4e81ed9de Move update issue code to separate service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:54:41 +03:00
Dmitriy Zaporozhets cfd9fd30d6 Move code for issue creation to service. 
The goal of suych refactoring is to get rid of observers.
Its much easier to test and code when object creation and all other
related actions done in one class instead of splited across observers,
callbacks etc.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:38:35 +03:00
Jacob Vosmaer bbea1d1a72 Include the Sidekiq version in gitlab:env:info 2014-04-01 16:05:26 +02:00
Dmitriy Zaporozhets 33a00ceeea Create branch via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-01 10:39:53 +03:00
Dmitriy Zaporozhets 9b276f0003 Move branches api to separate class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-31 16:31:53 +03:00
Dmitriy Zaporozhets 046fa9bdb1 Merge pull request #5469 from NARKOZ/api-pagination-headers 
add 'Link' header for API response
 2014-03-31 13:46:57 +03:00
Jacob Vosmaer 200eeea258 Make the repository downloads path configurable 2014-03-31 12:19:37 +02:00
Dmitriy Zaporozhets fdeacf0ad1 Merge pull request #6317 from jirutka/fix-ldap-dn-case 
Fix searching by extern_uid for LDAP to be case-insensitive
 2014-03-29 14:08:31 +02:00
Dmitriy Zaporozhets 48bd8a7e16 Merge remote-tracking branch 'origin/rake_drop_tables' 
Conflicts:
	CHANGELOG
 2014-03-28 22:37:17 +02:00
Jacob Vosmaer 2e6b537018 Use omniauth nickname as the username for LDAP 
Before there was a bug in omniauth-ldap which prevented samaccountname
showing up as a possible username for new LDAP users. Thanks to upstream
fixes, we no longer need to work around this bug.
 2014-03-28 13:57:52 +01:00
Jacob Vosmaer 77b57c114b Drop all tables before restoring a PostgreSQL DB 
Invoking 'db:schema:load' turned out to be a bad idea: when downgrading
an existing GitLab installation, the schema of the newer version would
be preserved when trying to import the old version.
 2014-03-28 13:44:46 +01:00
Jacob Vosmaer f48fc3c6cb Add a rake task that drops all tables 2014-03-28 13:37:09 +01:00
Dmitriy Zaporozhets cf7aab9b44 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-03-27 08:56:13 +02:00