home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,134 Commits 48 Branches 340 Tags
9bdd30f422237fc64d88330c0712e64d23464501
Commit Graph
11134 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schilling 9bdd30f422 Remove outdated 6.0 to 7.1 update guide 2014-08-23 12:16:18 +02:00
Robert Schilling 668c7d517a 7.3 started 2014-08-23 10:59:03 +02:00
Robert Schilling 33431c3e7d Merge pull request #7585 from bbodenmiller/patch-11 
clarify which configs should be updated
 2014-08-23 10:52:04 +02:00
Robert Schilling 9900c5bf81 Merge pull request #7584 from bbodenmiller/patch-9 
remove prerelease note from 6.0 to 7.2 guide
 2014-08-23 10:50:47 +02:00
Ben Bodenmiller aef3a5bf41 clarify which configs should be updated 2014-08-23 01:43:26 -07:00
Ben Bodenmiller 668e8aacfb remove prerelease note from 6.0 to 7.2 guide 2014-08-23 01:13:22 -07:00
Robert Schilling 30ea264b3b Merge pull request #7576 from bbodenmiller/patch-5 
[Documentation] cleanup installation guide formatting
 2014-08-23 02:33:44 +02:00
Robert Schilling 9c416ac2ff Merge pull request #7581 from bbodenmiller/patch-9 
make configuration comment spacing consistent
 2014-08-23 02:29:08 +02:00
Ben Bodenmiller 0a0cbe1274 make configuration comment spacing consistent 2014-08-22 17:20:31 -07:00
Robert Schilling 073cbc1c66 Merge pull request #7577 from bbodenmiller/patch-7 
[Documentation] GitLab 7.2 requires GitLab shell 1.9.7
 2014-08-22 23:08:09 +02:00
Ben Bodenmiller 40af6f9c23 gitlab 7.2 requires gitlab shell 1.9.7 2014-08-22 13:23:44 -07:00
Ben Bodenmiller e61b491ae1 cleanup installation guide formatting 
* Fix some formatting issues
* Make capitalization of titles consistent
* Update image that shows how to select branch
 2014-08-22 13:18:40 -07:00
Sytse Sijbrandij 6a0ea920a5 Merge branch 'fix_installation_version' into 'master' 
Fix installation version, we have 7.2 now

Change the branch name of cloning source to 7.2!! This also needs to be cherry picked to 7.2 stable branch

/cc @JobV @jacobvosmaer @marin

ps: unfortunately, there is mo 🤘 gemoji :(

See merge request !174
 2014-08-22 19:31:51 +00:00
Robert Schilling 5418c61747 We have 7.2 now 🤘 2014-08-22 20:36:03 +02:00
Sytse Sijbrandij 06fade7545 Simplify the description of single hash lines based on comments of Ben Bodenmiller. 2014-08-22 19:10:07 +02:00
Job van der Voort 230c52f76a update upgrader documentation to mention dependencies 2014-08-22 16:33:36 +02:00
Jacob Vosmaer abda2dab43 Merge branch 'rack_attack/unsubscribes' into 'master' 
Protect unsubscribe path

See merge request !1033
 2014-08-22 08:00:12 +00:00
Jacob Vosmaer b70606287b Create one big regular expresion for Rack::Attack 2014-08-22 09:56:39 +02:00
Marin JankovskiandJacob Vosmaer 52e903e99f Change rack attack example. 2014-08-22 09:56:39 +02:00
Jacob Vosmaer e328668f29 Merge branch 'backticks-cause-quote' into 'master' 
Backticks cause quote

See merge request !704
 2014-08-21 15:30:35 +00:00
Sytse Sijbrandij eea595971f Remove backticks in markdown links that cause ugly code blocks in GitLab. 2014-08-21 17:25:14 +02:00
Sytse Sijbrandij a83451a5c0 Merge branch 'doc/memory_recommendations' into 'master' 
Swap is required on servers with 1GB RAM

See merge request !1032
 2014-08-21 15:15:31 +00:00
Jacob Vosmaer ecd946be4c Swap is required on servers with 1GB RAM 2014-08-21 16:58:06 +02:00
Jacob Vosmaer 2a53249818 Merge branch 'gitlab_shell_to_1.9.7' into 'master' 
Bump required gitlab-shell version to 1.9.7

See merge request !1031
 2014-08-21 14:45:34 +00:00
Jacob Vosmaer bfaf3a79a9 Bump required gitlab-shell version to 1.9.7 2014-08-21 16:44:39 +02:00
Marin Jankovski 85cf0633fb Merge branch 'doc/update/cmake' into 'master' 
Add installing cmake to 7.2 update docs

See merge request !1029
 2014-08-21 14:31:49 +00:00
Jacob Vosmaer 5a6230b08c Merge pull request #7562 from xvonabur/patch-1 
Add dependency info for mysql-postgresql converter
 2014-08-21 16:21:00 +02:00
Jacob Vosmaer 0d8a4e380b Merge pull request #7436 from bbodenmiller/patch-3 
upgrade ruby and gitlab shell config during 6.0->7.1 & 6.0->7.2 upgrades
 2014-08-21 16:19:47 +02:00
Jacob Vosmaer 274ca09024 Add installing cmake to 7.2 update docs 2014-08-21 13:59:04 +02:00
Marin Jankovski 3ed8fbce2a Merge branch 'explain_migration' into 'master' 
Explain label migration

See merge request !1025
 2014-08-21 11:56:06 +00:00
Jacob Vosmaer df54f86816 Merge branch 'update_changelog' into 'master' 
Update changelog

Fixes #1509

See merge request !1026
 2014-08-21 11:52:24 +00:00
Jacob Vosmaer 6040e84bf4 Merge pull request #7540 from sameersbn/docs-install-cmake 
cmake is required during the installation of the rugged gem
 2014-08-21 12:57:01 +02:00
xvonabur 672daff56c Add dependency info for mysql-postgresql converter 
Running converter with Python 2.6.x installed gives the following error:
AttributeError: 'module' object has no attribute 'check_output'

After installing Python 2.7.x everything works fine.
 2014-08-21 14:28:45 +04:00
Jacob Vosmaer f2942ffee0 Merge pull request #7555 from erikjwaxx/master 
Fix spelling error in merge request performance issue warning.
 2014-08-21 11:20:43 +02:00
Marin Jankovski 7f8460159f Make sure the test fails in year 2114. 2014-08-21 10:49:12 +02:00
Jacob Vosmaer b1433228a5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-08-21 09:56:11 +02:00
Jacob Vosmaer 5f7be64084 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-08-21 09:56:01 +02:00
Jacob Vosmaer 846e2799c5 Merge pull request #7557 from Razer6/fix_tests 
Fix merge request API after #7526
 2014-08-21 09:55:15 +02:00
Jacob Vosmaer 44a210c0bd Merge branch 'fix_labels_edit' into 'master' 
Fix labels preview color when edit

This is related to #515. Parentheses are missing in coffeescript. For this reason, the color preview is not updated when loading the labels edit page.

See merge request !173
 2014-08-21 06:28:13 +00:00
Ben Bodenmiller 0e14fb0525 update ruby & gitlab shell config 
ruby 2.0.x required for gitlab 7.0+
 2014-08-20 20:05:17 -07:00
Robert Schilling 66f6ca0770 Fix tests after #7526 2014-08-20 20:34:55 +02:00
Erik Weatherwax 1ff781c3c9 Fix spelling error in merge request performance issue warning. 2014-08-20 12:53:19 -04:00
Robert Schilling 64102476dc Call updateColorPreview in Labels constructor 2014-08-20 18:11:51 +02:00
Jacob Vosmaer abf917d33d Merge branch 'label-doc' into 'master' 
Label doc

Fixes #1487

See merge request !1028
 2014-08-20 15:30:59 +00:00
Jacob Vosmaer 87efd92d8c Bump version to 7.2.0.rc5 v7.2.0.rc5 2014-08-20 17:13:03 +02:00
Jacob Vosmaer 2c97f5d636 Merge branch 'fix_google_oauth_gem' into 'master' 
Update omniauth-google-oauth2 gem

#### What does this MR do?

This PR updates google omniauth gem.

#### Why was this MR needed?

This is needed, because google deprecates some API on Sept, 1st.

All tests pass, but I still have to ~~test and update documentation in https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/google.md~~

**Contacts API" and "Google+ API need to be enabled**

This need to be stated in the update guide (7.1 to 7.2), as well as (6.0 to 7.2)

This fixes #512

See merge request !171
 2014-08-20 14:57:36 +00:00
Job van der Voort 2353554ba5 add required permission to label doc 2014-08-20 16:24:17 +02:00
Jacob Vosmaer 3946485765 Merge pull request #7526 from jubianchi/api/issue-api-validate-labels 
API: Labels validation in issues API
 2014-08-20 15:09:31 +02:00
Jacob Vosmaer f5b23bc2ca Bump version to 7.2.0.rc4 
Skipping rc3 because somebody (me) created a tag but did not bump the
version to rc3.
v7.2.0.rc4 		2014-08-20 15:03:18 +02:00
Jacob Vosmaer 1eaa8e18be Merge pull request #7553 from Razer6/fix_project_description 
Fix project description on explore page, fixes #7458
v7.2.0.rc3 		2014-08-20 14:30:58 +02:00