home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,126 Commits 48 Branches 340 Tags
04324908fb14fe2bb0600a164a60870100122d3f
Commit Graph
1377 Commits
Author SHA1 Message Date
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 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
Dmitriy Zaporozhets aabd90a828 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-27 08:55:51 +02:00
Marin Jankovski 7bf92b368f Ldap check recognize ldap user filter. 2014-03-26 15:38:14 +01:00
Jacob Vosmaer ad7cd8fb35 Merge pull request #6222 from nickryand/background_init 
Removed the backgrounding of the unicorn_rails startup scripts
 2014-03-26 12:25:40 +01:00
Jacob Vosmaer 24e9c5e83e Merge branch 'bugfix/fix_unicorn-sidekiq_confusion_in_gitlab_init_script' into 'master' 
Fix Unicorn-Sidekiq Confusion In GitLab Init Script

This merge request fixes issue #126 by updating a few sections of the included GitLab init file where Unicorn was referred to as Sidekiq and vice-versa.
 2014-03-26 11:19:26 +00:00
Pawel Krzaczkowski 9422b451eb Init script - change start() stop() restart() reload() to xxxx_gitlab() 2014-03-26 10:50:42 +01:00
Dmitriy Zaporozhets 17fd0e5c72 Merge pull request #6569 from criteo/api_merge_request_comments 
Add method to get the comments on a merge request
 2014-03-26 10:06:51 +02:00
Steven Thonus 8b35b20837 first setup to protect protected branched to force updates 2014-03-25 22:33:14 +01:00
Marin Jankovski 9dd58c320a Add to changelog. 2014-03-25 18:53:09 +01:00
Marin Jankovski 02850210b6 Allow referencing an existing user. 2014-03-25 18:53:09 +01:00
Nick Downs 73a987ea6b Removed the backgrounding of the unicorn_rails webapp start call. 2014-03-25 10:40:44 -07:00
Dmitriy Zaporozhets a7aacb4dc4 Merge pull request #6586 from abner/master 
added api method to return labels of a given project
 2014-03-25 19:39:16 +02:00
Jacob Vosmaer 306d4ee728 Merge pull request #5935 from nmoura/patch-1 
Changed sudo by su -c in init script
 2014-03-25 15:06:54 +01:00
Marin Jankovski 8af94ed755 Add gzip compression for assets to nginx example. 2014-03-24 14:59:09 +01:00
Ábner Silva de Oliveira e153469f31 changed doc comment for get labels of a project 2014-03-23 19:07:18 -03:00
Ábner Silva de Oliveira cc575875b6 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-03-22 16:43:09 -03:00
Robert Speicher 760f827ba0 Remove code that does nothing 
ping @karlhungus
 2014-03-22 15:40:42 -04:00
Robert Speicher fa34059574 Default message for SatelliteNotExistError 2014-03-22 15:36:54 -04:00
Dmitriy Zaporozhets ae1a314824 Fix upgrader 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:08:36 +02:00
Dmitriy Zaporozhets 5c038d949f Fix gitlab-ci integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 23:04:57 +02:00
Dmitriy Zaporozhets 7dd18a3ec8 Fix http clone for public project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-21 14:52:30 +02:00
Marin Jankovski 895c913247 Use the latest tag, 1.9.1 for gitlab-shell. 2014-03-21 12:42:59 +01:00
Ábner Silva de Oliveira 44aa6b90dd added api method to return labels of a given project 2014-03-21 06:25:25 -03:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Dmitriy Zaporozhets e013be10d7 GitLab requires gitlab-shell v1.9.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 13:37:35 +02:00
Dmitriy Zaporozhets 83e83b6617 Improve grack auth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:53:03 +02:00
Dmitriy Zaporozhets 729b358ff2 push via http now served via /allowed API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets f18a714f35 Use GitAccess in internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Dmitriy Zaporozhets 19c28822ef Add Gitlab::GitAccess class to resolve auth issues during pull/push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Stuart Pook 9886998f24 Add method to get the comments on a merge request 
Add method to get the comments for a merge request and
document that you can change the status of a merge request.
 2014-03-19 19:07:51 +01:00
Jacob Vosmaer acaf297846 Merge pull request #5993 from DarkHorseComics/bypass-commented-sqlite 
Explain what to do about legacy sqlite in database.yml
 2014-03-18 10:48:27 +01:00
Dmitriy Zaporozhets 8fa53ce43d Merge branch 'check_orphaned_users_groups' into 'master' 
Check Orphaned Users Groups
 2014-03-18 07:14:08 +00:00
Jamey J. DeOrio 37192d5e18 Add more descriptive line for resolving sqlite error during check 2014-03-17 09:43:27 -07:00