home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,257 Commits 48 Branches 340 Tags
e73a4eeafb64d8f7bbaf01ac52d8b2dc3c2d916a
Commit Graph
12257 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valeriy Sizov e73a4eeafb Merge pull request #8066 from bbodenmiller/patch-18 
[7.4 rc fix] [doc] stop gitlab before mysql optimizations, run checks
 2014-10-21 13:01:54 +03:00
Valeriy Sizov 62929caf29 Merge pull request #8067 from bbodenmiller/patch-19 
[7.4 rc fix] [doc] actually give command necessary to update unicorn
 2014-10-21 13:01:04 +03:00
Valeriy Sizov bc56de15b5 Merge pull request #8070 from bbodenmiller/patch-22 
[7.4 rc fix] [doc] stop gitlab before backup
 2014-10-21 12:47:54 +03:00
Valeriy Sizov 2dd94657dc Merge pull request #8071 from bbodenmiller/patch-7 
[7.4 rc fix] [doc] add missing configure Redis to use sockets
 2014-10-21 12:44:42 +03:00
Valeriy Sizov 39bbf078ff Merge pull request #8072 from bbodenmiller/patch-12 
[7.4 rc fix] [doc] add optimizations for mysql to 6.x->7.4 guide
 2014-10-21 12:43:23 +03:00
Valery Sizov a54d5dc776 Merge branch 'fixes-from-master' into '7-4-stable' 
Fixes from master

It includes:

* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1193
* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1196
* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1195

See merge request !1198
 2014-10-20 16:38:23 +00:00
Jan-Willem van der MeerandDmitriy Zaporozhets 3d3726a026 Default the LDAP server label to LDAP 2014-10-20 16:38:08 +03:00
Jan-Willem van der MeerandDmitriy Zaporozhets 49bd981200 Prevent redeclaration of LDAP strategy 2014-10-20 16:38:07 +03:00
Dmitriy Zaporozhets 644fd232db Add tests for remove group member feature in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 16:37:52 +03:00
Dmitriy Zaporozhets ebc0a7050a Fix group user removal from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 16:37:52 +03:00
Jacob VosmaerandDmitriy Zaporozhets 082d59d21f Ask the wiki repo, not Gollum, if it's empty 
We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.
 2014-10-20 16:37:20 +03:00
Ben Bodenmiller 4880b91ff1 add optimizations for mysql to 6.x->7.4 guide 
Add mysql optimizations from 7.3-to-7.4.md.
 2014-10-18 02:13:15 -07:00
Ben Bodenmiller 0ff6105589 add missing configure Redis to use sockets 
Add details from 7.2-to-7.3.md. Replaces https://github.com/gitlabhq/gitlabhq/pull/8047.
 2014-10-18 02:08:01 -07:00
Ben Bodenmiller 3e6b284bd0 stop gitlab before backup 2014-10-18 01:51:35 -07:00
Ben Bodenmiller 9a92e53f62 stop gitlab before backup 
Stopping gitlab before backup ensures that backup has everything before upgrade incase something goes wrong. Also remove extra cd.
 2014-10-18 01:49:59 -07:00
Ben Bodenmiller 76e2ae8148 actually give command necessary to update unicorn 
Give command to update unicorn.rb rather than just say you need to do it.
 2014-10-18 01:39:01 -07:00
Ben Bodenmiller 35b1a036d7 stop gitlab before mysql optimizations, run checks 
Update MySQL optimizations to reflect doing updates after GitLab has already been started back up.
 2014-10-18 01:33:51 -07:00
Dmitriy Zaporozhets 564c4138e9 Merge branch 'master' into '7-4-stable' 
Merge master into 7-4-stable

See merge request !1189
 2014-10-17 13:57:28 +00:00
Dmitriy Zaporozhets 5a4a1a2fa4 Merge branch 'fix-oauth-block' into 'master' 
Fix user being blocked after oauth sign-in

See merge request !1190
 2014-10-17 12:35:46 +00:00
Dmitriy Zaporozhets f8cdd62e22 Fix account existing blocking 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 14:08:02 +03:00
Valery Sizov 4da88dbb2d documents updated 2014-10-17 13:47:20 +03:00
Dmitriy Zaporozhets 966f68b33e Refactor error message a bit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 13:15:59 +03:00
Dmitriy Zaporozhets fd22d32bcd Merge branch 'issue-respect-single-sign-on' into 'master' 
Issue respect single sign on

Adds regression test for #1677

See merge request !1188
 2014-10-17 10:10:01 +00:00
Jan-Willem van der Meer d9bfebc0e8 Add regressiontest to verify allow_single_sign_on setting 
verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models
 2014-10-16 20:08:30 +02:00
Jan-Willem van der Meer fad588f2be Remove LDAP save test 
This is handled within the LDAP class
 2014-10-16 17:18:40 +02:00
Dmitriy Zaporozhets 32d0bf3afd Fix snippets seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-16 16:50:09 +03:00
Dmitriy Zaporozhets d6fdca9a88 Merge branch 'add_some_stuff_to_changelog' into 'master' 
Add a few items to changelog

See merge request !1187
 2014-10-16 11:57:49 +00:00
Dmitriy Zaporozhets de253100b5 Merge branch 'issue-respect-single-sign-on' into 'master' 
Issue respect single sign on

Fixes #1677 by making sure the per-build user is saved as well. Otherwise the user is passed to devise, and the user is saved afterwards, creating a successful signup.

See merge request !1186
 2014-10-16 11:51:48 +00:00
Valery Sizov 761c2a64cc Add items to changelog 2014-10-16 14:02:24 +03:00
Jan-Willem van der Meer 92c184a57f Disallow new users from Oauth signup if allow_single_sign_on is disabled 
Because devise will trigger a save, allowing unsaved users to login, behaviour had changed.
The current implementation returns a pre-build user, which can be saved without errors.

Reported in #1677
 2014-10-16 11:46:40 +02:00
Dmitriy Zaporozhets 05922e71f4 Merge branch 'fix_project_number_ci' into 'master' 
Fix link to githost.io

Documentation pointed to wrong gitlab-ci project.

See merge request !222
 2014-10-16 09:35:09 +00:00
Achilleas Pipinellis c2bcdeb950 Make semaphore configuration an ordered list. 2014-10-15 20:52:39 +03:00
Achilleas Pipinellis b57ec54fae Point to correct project on githost.io. 2014-10-15 20:25:47 +03:00
Dmitriy Zaporozhets a0a826ebdc Merge branch 'note-omnibus-in-installation' into 'master' 
Note omnibus in installation

See merge request !1184
 2014-10-15 15:55:00 +00:00
Dmitriy Zaporozhets 5fc12561c1 Merge branch 'improve-lock-mr-ui' into 'master' 
Improve locked merge request UI

It allows us easily detect when MR get into lock state

Fixes UI part of #1674

See merge request !1183
 2014-10-15 14:32:52 +00:00
Sytse Sijbrandij e8e022daec Refer to the Omnibus installation from eveerywhere since people link to installation.md directly. 2014-10-15 16:29:05 +02:00
Dmitriy Zaporozhets 3f1c95c638 Merge branch 'no_red_builds_policy' into 'master' 
No red builds policy

Related to gitlab/organization#63

See merge request !1182
 2014-10-15 13:09:23 +00:00
Dmitriy Zaporozhets c926922ade Show merge in progress message if MR is locked 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-15 15:52:39 +03:00
Dmitriy Zaporozhets 381a6283a9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-15 15:35:08 +03:00
Dmitriy Zaporozhets 8200992991 Merge branch 'migrating_from_svn_doc' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/workflow/README.md
 2014-10-15 15:29:45 +03:00
Dmitriy Zaporozhets 67a28cea30 Merge pull request #8048 from skv-headless/master 
same rendering for note diff as for usual diff
 2014-10-15 15:15:40 +03:00
Dmitriy Zaporozhets e853ddd8a9 Merge branch 'valery_changelog' into 'master' 
Changelog: added information about sorting users

See merge request !1175
 2014-10-15 11:54:25 +00:00
Dmitriy Zaporozhets b8b0c3276a Merge branch 'notifications_documentation' into 'master' 
Notifications documentation

Fixes #1583

See merge request !1177
 2014-10-15 11:53:28 +00:00
Marin Jankovski af609805c5 Use clearer description. 2014-10-15 13:16:03 +02:00
Marin Jankovski 76cde5c0e5 Add links to the migration doc, make it clear import is only for git repos. 2014-10-15 13:13:42 +02:00
Marin Jankovski 2803d9e025 Git is a distributed vcs. 2014-10-15 13:08:55 +02:00
Marin Jankovski adb64dc2ee Clearer what to contribute. 2014-10-15 13:08:55 +02:00
Marin Jankovski fb05fa859e Add a doc on how to migrate from SVN to gitlab. 2014-10-15 13:08:55 +02:00
Marin Jankovski 57b38f6f1c Describe who can trigger builds and where, add no red tests policy to contributing doc. 2014-10-15 12:48:37 +02:00
Dmitriy Zaporozhets 19b0ba5ecb Merge branch 'fix-star-icon' into 'master' 
Fix star icon

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/682.

See merge request !1180
 2014-10-15 09:36:19 +00:00