home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,519 Commits 48 Branches 340 Tags
2c047642f5afd68faaafa39385d5b2c29de7ea1e
Commit Graph
11519 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan-Willem van der Meer 2c047642f5 Update Gemfile.lock 2014-09-11 12:59:42 +02:00
Jan-Willem van der Meer bf0de1a500 Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring 2014-09-11 11:46:08 +02:00
Dmitriy Zaporozhets 78ec7d9c9d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-11 11:22:33 +03:00
Dmitriy Zaporozhets 745f262c16 Merge branch 'root_password_configurable' into 'master' 
Root password configurable through environmental variable

Fixes #1522

See merge request !1084
 2014-09-11 08:22:06 +00:00
Marin Jankovski 09e64ae605 Add an option to supply root password through an environmental variable. 2014-09-11 10:06:56 +02:00
Dmitriy Zaporozhets 17fd28468e Merge branch 'project-destroy-redirect' into 'master' 
Redirect users to Projects Admin Page after removing a project

Fixes issue #543 by redirecting the user to "admin_projects_path" and displaying the flash alert "Project removed."

See merge request !178
 2014-09-11 06:45:52 +00:00
Dmitriy Zaporozhets d7ab859b91 Merge pull request #7728 from bbodenmiller/patch-7 
cleanup MySQL doc wording
 2014-09-11 09:24:26 +03:00
Dmitriy Zaporozhets 59187157b1 Merge pull request #7730 from bbodenmiller/patch-12 
url -> URL
 2014-09-11 09:24:11 +03:00
Dmitriy Zaporozhets 9669d33ee8 Merge pull request #7732 from bbodenmiller/patch-13 
Increase import timeout from 2 to 4 minutes
 2014-09-11 09:23:53 +03:00
Ben Bodenmiller d915a239f7 Increase import timeout from 2 to 4 minutes 
This file was missed in https://github.com/gitlabhq/gitlabhq/commit/4535db04b28996baf118bafeb77acd16065e5c5a.
 2014-09-10 18:38:47 -07:00
Ben Bodenmiller 9d9109eecf url -> URL 2014-09-10 18:20:06 -07:00
Ben Bodenmiller bc04c26325 url -> URL 2014-09-10 18:19:31 -07:00
Ben Bodenmiller 43f0efe5d3 cleanup MySQL doc wording 2014-09-10 17:23:06 -07:00
Robert Schilling aa8c915deb Merge pull request #7726 from cirosantilli/typo-locally 
Typo localy -> locally.
 2014-09-10 22:34:48 +02:00
Ciro Santilli 84bbf07d96 Typo localy -> locally. 2014-09-10 22:20:40 +02:00
Dmitriy Zaporozhets ebae2d0241 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-10 20:47:59 +03:00
Dmitriy Zaporozhets 6135eb0adf Merge pull request #7705 from dblessing/serialize_service_properties 
Serialize service properties
 2014-09-10 20:47:47 +03:00
Dmitriy Zaporozhets 1e1dd53948 Merge branch 'word_wrap_in_description' into 'master' 
Word wrap in description

Fixes #1560

See merge request !1082
 2014-09-10 17:17:48 +00:00
Dmitriy Zaporozhets 4a5719f990 Merge pull request #7725 from matusb/feature/shibboleth-support 
shibboleth authentication support
 2014-09-10 19:24:14 +03:00
Dmitriy Zaporozhets e31ba68732 Merge branch 'wrap_by_default_for_parallel' into 'master' 
Wrap by default for parallel

Fixes #1566

See merge request !1080
 2014-09-10 16:06:32 +00:00
Dmitriy Zaporozhets e1bd883c64 Merge branch 'gitlab-grit-2.6.11' into 'master' 
Update gitlab-grit to 2.6.11

See merge request !1081
 2014-09-10 16:04:30 +00:00
Marin Jankovski 4e6d0daf1a Wrap text that overflows the description field. 2014-09-10 17:30:29 +02:00
Jacob Vosmaer ae0987424f Update gitlab-grit to 2.6.11 
From the gitlab-grit changelog:
  * Suppress 'unkown header' warnings
  * Add process.out to CommandFailed error
 2014-09-10 17:12:40 +02:00
Drew Blessing a0dbcd2365 Serialize services properties 2014-09-10 09:56:39 -05:00
Marin Jankovski 11eec88d97 Wrap should always be enabled for parallel diff. 2014-09-10 16:46:10 +02:00
Dmitriy Zaporozhets ffb6d27ab0 Merge branch 'update_omniauth_ldap' into 'master' 
Update omniauth-ldap and net-ldap

See merge request !1077
 2014-09-10 13:55:20 +00:00
Marin Jankovski 83e5211a1d Merge pull request #7724 from gitlabhq/revert-7252-master 
Revert "Delete mailer queue"
 2014-09-10 15:30:01 +02:00
Marin Jankovski 976eb7a955 Revert "Delete mailer queue" 2014-09-10 15:28:58 +02:00
Marin Jankovski c091e6cfff Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-10 15:28:01 +02:00
Jacob Vosmaer 6225204904 Merge branch 'use-canonical-repos' into 'master' 
Use canonical repos

/cc @dzaporozhets

See merge request !1079
 2014-09-10 11:17:43 +00:00
Sytse Sijbrandij 07061b672c Link to the canonical repos. 2014-09-10 12:40:13 +02:00
Sytse Sijbrandij f2007e7488 Merge branch 'testme_url' into 'master' 
Fetch the testme repository from gitlab.com

See merge request !1078
 2014-09-10 10:33:13 +00:00
Jacob Vosmaer b0435576df Fetch the testme repository from gitlab.com 
The repository was removed from github.com/gitlabhq.
 2014-09-10 12:22:47 +02:00
Jacob Vosmaer f964067c95 Update omniauth-ldap and net-ldap 2014-09-10 11:15:23 +02:00
Robert Schilling f905abc03a Merge pull request #7719 from williamherry/improve/improve_mysql_to_postgresql_doc 
add bunder step to mysql_to_postgresql doc
 2014-09-10 09:13:21 +02:00
William Herry 276ee45487 add bunder step to mysql_to_postgresql doc 2014-09-10 05:55:45 +08:00
Matus Banas f8ec9dd397 added omniauth-shibboleth gem for shibboleth support 
added documentation for shibboleth omniauth provider
updated changelog
 2014-09-09 22:16:05 +01:00
Robert Schilling bbe5044395 Merge pull request #7717 from bbodenmiller/patch-3 
fix formatting issue in installation guide
 2014-09-09 21:01:17 +02:00
Ben Bodenmiller 083b153d45 fix formatting issue 
fix formatting issue with self-signed certificate section
 2014-09-09 10:43:28 -07:00
Dmitriy Zaporozhets 6b7e80cb19 Prevent 500 error when search wiki for non-existing repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-09 17:56:33 +03:00
Dmitriy Zaporozhets 638331d05a Merge branch 'parallel_diff_refactor' into 'master' 
Parallel diff refactor

Refactor side-by-side diff to remove code duplication.

Base the side-by-side diff on inline diff code.

In first iteration:

1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code

See merge request !1066
 2014-09-09 13:57:50 +00:00
Dmitriy Zaporozhets 0e78d00bcb Merge pull request #7695 from coverer/search_wiki 
Added search wiki feature
 2014-09-09 16:50:43 +03:00
Dmitriy Zaporozhets 04cf074552 Merge branch 'bourne_shell' into 'master' 
Wrap arguments for `[ -z` in double quotes

See merge request !1071
 2014-09-09 12:31:41 +00:00
Dmitriy Zaporozhets 0cff6df0f2 Merge branch 'add-ci-to-blacklist' into 'master' 
Add ci to blacklist

See merge request !1075
 2014-09-09 12:30:55 +00:00
Marin Jankovski 8ebb26fcc1 Add diff_helper spec. 2014-09-09 13:17:42 +02:00
Dmitriy Zaporozhets 29e7647a08 Merge branch 'close_button_after_added_comment' into 'master' 
Close button after added comment

Fixes #1549

See merge request !1070
 2014-09-09 11:02:10 +00:00
Dmitriy Zaporozhets 60ea455d08 Merge branch 'api-project-path' into 'master' 
API: Project create docs miss path argument

Fixes #1551

See merge request !1074
 2014-09-09 11:00:55 +00:00
Marin Jankovski 2ff83aa389 Fix typo. 2014-09-09 11:52:16 +02:00
Marin Jankovski ac6a107ac7 Add line code to parallel diff for linking. 2014-09-09 11:36:29 +02:00
Marin Jankovski 9c3935c5b0 Use the new path to the partial, move the diff related methods to the new helper. 2014-09-09 11:10:40 +02:00