home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 05:56:37 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,057 Commits 48 Branches 340 Tags
b5d0f90e3047676f4e129ed4cd2732b6c5a7a3eb
Commit Graph
13057 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij b5d0f90e30 Warn people about not exposing at a time they can still do something about it. 2014-12-23 09:48:43 +01:00
Sytse Sijbrandij 73885c31d6 Merge branch 'install-guide' into 'master' 
Install guide

Add libkrb5-dev to upgrader /cc @dzaporozhets @valery

See merge request !1341
 2014-12-23 08:24:01 +00:00
Sytse Sijbrandij 9c7a7d4349 Add libkrb5-dev dependency. 2014-12-23 09:23:19 +01:00
Job van der Voort cc2f14ea0b Merge branch 'mention-the-team' into 'master' 
Mention the team

See merge request !1339
 2014-12-22 20:03:04 +00:00
Sytse Sijbrandij e99ea1146a Clear responsibility to mention the team. 2014-12-22 20:58:22 +01:00
Dmitriy Zaporozhets bf69d18346 Initiate 7.7 CHANGELOG 2014-12-22 15:35:47 +00:00
Dmitriy Zaporozhets 602fd68dc1 Merge branch 'rename_sanitize_in_check_task' into 'master' 
Rename sanitize in check task

This is to prevent the name clash between `sanitize_helper.rb` method sanitize and the method used to check if env variable is set in rake task.

See merge request !1336
 2014-12-22 14:19:21 +00:00
Marin Jankovski 18d9172edc Use a different name of the method to check if sanitize is enabled in check task. 2014-12-22 10:03:52 +01:00
Dmitriy Zaporozhets 55319c0a7a Merge pull request #8474 from dblessing/feature/system_note_ui 
Differentiate system notes
 2014-12-21 13:38:53 +02:00
Robert Schilling f7f56e4a0b Merge pull request #8256 from cirosantilli/rm-unused-has_gitlab_shell3 
Remove unused has_gitlab_shell3? method
 2014-12-21 10:15:34 +01:00
Drew Blessing a9761ac1b8 Differentiate system notes 2014-12-20 16:20:29 -06:00
Dmitriy Zaporozhets 0f7d47f695 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-20 20:20:39 +02:00
Dmitriy Zaporozhets dc0879ac9e Merge pull request #7882 from cirosantilli/blob-instance-to-local 
Use blob local instead of instance.
 2014-12-20 20:19:59 +02:00
Dmitriy Zaporozhets e007d810c9 Merge pull request #7886 from cirosantilli/disable-blob-edit-mr 
Disable / hide MR edit blob button if cannot edit.
 2014-12-20 20:19:38 +02:00
Dmitriy Zaporozhets 5a7e3500e9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-20 20:19:00 +02:00
Dmitriy Zaporozhets 8c1be08d9f Merge pull request #8422 from gemnasium/update_gemnasiumm-gitlab-service 
Update gemnasium-gitlab-service to version 0.2.3
 2014-12-20 20:18:40 +02:00
Dmitriy Zaporozhets 223e509f70 Merge pull request #7894 from cirosantilli/fix-dev-user-seed 
Fix dev user seed: ID was used twice.
 2014-12-20 20:18:15 +02:00
Dmitriy Zaporozhets 6a5766e370 Merge pull request #7978 from cirosantilli/edit-preview-route-test 
Add tests for tree edit routes
 2014-12-20 20:17:25 +02:00
Dmitriy Zaporozhets e37ecb7ea6 Merge pull request #8458 from kfei/docker/reduce-image-size 
Reduce the size of Docker image
 2014-12-20 20:16:48 +02:00
Dmitriy Zaporozhets 632da319bf Merge pull request #8455 from kfei/docker/update-omnibus-package 
Update the Omnibus package in Dockerfile
 2014-12-20 20:16:17 +02:00
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
kfei e9f974dc12 Reduce the size of Docker image 
1) Add `--no-install-recommends` option to `apt-get install`, this
   avoids lots of (~30MB) unnecessary packages.
2) Add `ca-certificates` package for `wget` fetching stuffs from Amazon
   S3.
3) There is no need to run `apt-get clean` for an image derived from
   official Ubuntu since they already cleaned (see also:
   http://goo.gl/B2SQRB) all the garbages produced by `apt-get`.

Signed-off-by: kfei <kfei@kfei.net>
 2014-12-16 22:49:43 -08:00
kfei c981d69338 Update the Omnibus package in Dockerfile 
From 7.5.2 to 7.5.3.

Signed-off-by: kfei <kfei@kfei.net>
 2014-12-16 09:04:52 -08: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