home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,029 Commits 48 Branches 340 Tags
5aeb80537eebb36a1b07ddbb189267ffc293f957
Commit Graph
13029 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 5aeb80537e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-20 19:47:03 +02:00
Dmitriy Zaporozhets a978673362 Merge pull request #8451 from skv-headless/transfer-error-handler 
transfer error handler
 2014-12-20 19:46:04 +02:00
Drew Blessing 3f13a0466f Merge pull request #8469 from xperseguers/patch-1 
[BUGFIX] Invalid branch in comparison
 2014-12-20 09:25:56 -06:00
Jeroen van Baarsen 13104450cf Merge pull request #8466 from cirosantilli/raketasks-doc 
Fix Rake tasks doc README: add top level h1
 2014-12-20 14:00:28 +01:00
Dmitriy Zaporozhets b136976ab1 Merge pull request #8452 from dblessing/feature/theme_class 
Add theme type css class
 2014-12-19 22:28:18 +02:00
Xavier Perseguers 1e22b494e2 [BUGFIX] Invalid branch in comparison 2014-12-19 13:49:33 +01:00
Sytse Sijbrandij 549540f100 Merge branch 'omniauth-config-sample-link' into 'master' 
Add link to OmniAuth config sample for Omnibus

Added a link to the OmniAuth config sample for Omnibus installations.

See merge request !1335
 2014-12-18 19:16:32 +00:00
Patricio Cano 6d747cfd3a Added link to the configuration sample for OmniAuth providers when using Omnibus. 2014-12-18 09:50:20 -05:00
Job van der Voort 1524e2171a Merge branch 'update-doc-7-6' into 'master' 
Update Documentation for 7.6 release

Updated the update and install documentation for the 7.6 release.

See merge request !1334
 2014-12-18 13:07:44 +00:00
Ciro Santilli a55feb14f1 Fix Rake tasks doc README: add top level h1 
and link to missing to features.md.
 2014-12-18 09:22:34 +01:00
Patricio Cano 7813363fd7 Fixed version reference 2014-12-17 18:02:58 -05:00
Patricio Cano 918245094c Added update guide for updating to 7.6 2014-12-17 18:00:43 -05:00
Dmitriy Zaporozhets b87c9e289e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-12-17 14:09:26 +02:00
Dmitriy Zaporozhets 223c3e3b9e Merge branch 'credentials-in-readme' into 'master' 
Credentials in readme

See merge request !1332
 2014-12-17 11:17:37 +00:00
Sytse Sijbrandij 3f129fd618 Include default credentials in the readme and make all headers the same. 2014-12-17 11:07:10 +01:00
Dmitriy Zaporozhets 6ab9d678d7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-17 11:51:27 +02:00
Dmitriy Zaporozhets 2fef5c1323 Merge branch 'dev-docs-in-gdk' into 'master' 
Dev docs in gdk

Also see https://gitlab.com/gitlab-org/gitlab-development-kit/merge_requests/31

See merge request !1331
 2014-12-17 09:49:10 +00:00
Jeroen van Baarsen df32ad6c15 Merge pull request #8375 from bbodenmiller/process-fix 
update order of upgrade guide
 2014-12-17 09:37:07 +01:00
Sytse Sijbrandij 98e64610b2 Move development information to the GitLab Development Kit. 2014-12-17 08:27:03 +01:00
Dmitriy Zaporozhets fb7ba2deac Merge branch 'update_gemfile_with_kerberos' into 'master' 
Add kerberos to gemfile

See merge request !1330
 2014-12-16 15:48:42 +00:00
Valery Sizov 15303bbfd7 add kerberos to Gemfile 2014-12-16 13:57:40 +02:00
Dmitriy Zaporozhets 8d71e4e0d0 Merge branch 'doc/sidekiq_memory_killer' into 'master' 
Add documentation for the Sidekiq MemoryKiller

We already merged the code, and we are already using it on gitlab.com. This MR adds documentation.

See merge request !1325
 2014-12-16 11:23:52 +00:00
Patricio Cano f023db2b47 Merge branch 'update_changelog_7_6' into 'master' 
Update changelog 7.6

See merge request !1327
 2014-12-15 19:45:28 +00:00
Drew Blessing f06f69b9da Add theme type css class 2014-12-15 13:21:26 -06:00
Valery Sizov 842ac35ae4 Update changelog 2014-12-15 20:22:18 +02:00
Dmitriy Zaporozhets a64d0f7917 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-12-15 17:25:50 +02:00
Dmitriy Zaporozhets ee54e56f7d Merge branch 'kerberos_dependency' into 'master' 
Kerberos dependency

See merge request !1324
 2014-12-15 15:17:37 +00:00
Dmitriy Zaporozhets f8ea016486 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-15 17:06:11 +02:00
Dmitriy Zaporozhets 14ab0228a8 Merge branch 'fix-note-update' into 'master' 
Fix note update

In some strange cases Ruby thinks `system` is not AR field but
Kernel.system call and raises exception during save. It should prevent
this random wierd behaviour.

Exception log:

```
ArgumentError (wrong number of arguments (0 for 1+)):
  app/models/note.rb:505:in `system'
  app/models/note.rb:505:in `editable?'
  app/controllers/projects/notes_controller.rb:33:in `update'
```

See merge request !1326
 2014-12-15 15:05:22 +00:00
Dmitriy Zaporozhets 4ab728bfe8 Fix random Argument error when update note 
In some strange cases Ruby thinks `system` is not AR field but
Kernel.system call and raises exception during save. It should prevent
this random wierd behaviour

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 16:31:23 +02:00
Jacob Vosmaer d117927131 Add link to 'operations' README 2014-12-15 15:17:10 +01:00
skv-headless c4a56797a4 transfer error handler 2014-12-15 16:10:56 +03:00
Jacob Vosmaer e61e7a17b4 Remove unfinished file with the wrong name 2014-12-15 13:44:47 +01:00
Jacob Vosmaer 71789468d3 Add documentation for the Sidekiq MemoryKiller 2014-12-15 13:43:36 +01:00
Valery Sizov 83de96ae3a add kerberos dependency 2014-12-15 14:01:55 +02:00
Sytse Sijbrandij d37bdd0ccd Merge pull request #8446 from jvanbaarsen/added-process-for-green-tests 
Added process for green tests
 2014-12-15 10:52:08 +01:00
Jeroen van Baarsen 5ad463e0e8 Rephrase of the text 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-15 10:41:30 +01:00
Dmitriy Zaporozhets 19865b7cfd Merge pull request #8448 from jvanbaarsen/fixed-already-defined-messages 
Fixed a lot of already defined notices
 2014-12-15 11:14:31 +02:00
Sytse Sijbrandij 9fc739e5d0 Merge pull request #8447 from jvanbaarsen/added-code-of-conduct 
Added Code of Conduct
 2014-12-15 09:34:54 +01:00
Jeroen van Baarsen be206a5142 Merge pull request #8410 from tricknotes/add-webhook-doc-for-tag-event 
Add missing webhook doc for tag event
 2014-12-14 18:35:31 +01:00
Jeroen van Baarsen 6b1f2e4339 Added Code of Conduct 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-14 18:34:23 +01:00
Jeroen van Baarsen ba4fe47606 Merge pull request #8374 from bbodenmiller/7-5-update-fix 
remove extra upgrade details, add missing config
 2014-12-14 18:31:37 +01:00
Ryunosuke SATO d11e048d7f Add missing webhook doc for tag event 2014-12-14 23:47:13 +09:00
Jeroen van Baarsen 4eb3c47d4e Fixed a lot of already defined notices 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-14 15:13:09 +01:00
Jeroen van Baarsen ed7b3f84ae Merge pull request #8429 from zertrin/fix-typo-in-docker-readme-1 
Fix typo in the README.md for docker
 2014-12-14 14:49:48 +01:00
Jeroen van Baarsen 0cfca15292 Added process for green tests 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-13 20:09:26 +01:00
Jeroen van Baarsen 3615b4de24 Merge pull request #8359 from bbodenmiller/patch-1 
add details on backing up your SSH host keys
 2014-12-13 17:24:56 +01:00
Dmitriy Zaporozhets 2497273030 Update CHANGELOG with snippet validation change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 16:35:05 +02:00
Dmitriy Zaporozhets ff65e55694 Merge branch 'sanitize-snippet-file-name' into 'master' 
Validate and sanitize snippet file name

Fixes #1816

See merge request !1322
 2014-12-12 14:31:51 +00:00
Dmitriy Zaporozhets bfebab1c10 Fix snippet factory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 15:55:06 +02:00