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
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Bodenmiller 12e751a892 Quit the database session at end of database setup 2014-10-30 00:01:19 -07:00
Ben Bodenmiller 9c6106c4f6 clarify that 'template1=#' is part of prompt 
Similar to https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/database_mysql.md clarify that `template1=#` is part of the prompt.
 2014-10-29 23:58:34 -07:00
Ben Bodenmiller 87fa3f0d2e ruby -> Ruby 2014-10-29 21:18:57 -07:00
Ben Bodenmiller 1f62cb3ee7 fix git installation 2014-10-29 19:09:24 -07:00
Sytse Sijbrandij 041ffdd511 Merge branch 'easyfix_in_contributing_md' into 'master' 
Refer to easyfix issues in CONTRIBUTING.md

See merge request !229
 2014-10-29 23:29:23 +00:00
Sytse Sijbrandij bd0d679b23 Update patch manual to link to blog post. 2014-10-29 16:24:07 -07:00
Achilleas Pipinellis 3326452322 Refer to easyfix issues in CONTRIBUTING.md. 2014-10-30 01:23:47 +02:00
Patricio Cano e712583a5e Improved rake documentation for importing existing repositories with a rake task. 2014-10-29 17:21:55 -05:00
Dmitriy Zaporozhets f01e311ed1 Merge branch 'update-gitlab-shell-to-corresponding-version' into 'master' 
Update gitlab shell to corresponding version

This prevents people upgrading to a to recent version of GitLab Shell as happend in https://gitlab.com/gitlab-org/gitlab-ce/issues/700

See merge request !227
 2014-10-29 17:10:36 +00:00
Dmitriy Zaporozhets 905004fdc3 Merge pull request #7980 from mr-vinn/diff-renames 
Display renamed files in diff views
 2014-10-29 19:09:33 +02:00
Dmitriy Zaporozhets 9cadfc9e13 Update omniauth-ldap & dependencies 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 17:17:22 +02:00
Valery Sizov d52a5c7608 update changelog 2014-10-29 16:51:57 +02:00
Dmitriy ZaporozhetsandValery Sizov 9de385435d Explicitly require addressable gem feature you need. Fixes Buildbox CI integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:49:09 +02:00
Valery Sizov ed9350dc57 Merge branch 'fix-buildbox-integration' into 'master' 
Fix buildbox integration

Fixes gitlab/gitlabhq#1725

See merge request !1229
 2014-10-29 14:47:36 +00:00
Dmitriy Zaporozhets ec5482a0dc Explicitly require addressable gem feature you need. Fixes Buildbox CI integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:34:28 +02:00
Valery Sizov 1ab1526d92 Fix raw view for public snippets 2014-10-29 16:11:28 +02:00
Dmitriy ZaporozhetsandValery Sizov a2dfff418b Dont allow guests..developers to manage group members 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:00:55 +02:00
Dmitriy ZaporozhetsandValery Sizov 995d198419 Split group members api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:00:46 +02:00
Dmitriy ZaporozhetsandValery Sizov 43fba7f0c5 Add failing test that should be green after group members api get fixed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:00:38 +02:00
Valery Sizov 912715c3e4 update changelog && bump version 2014-10-29 15:59:57 +02:00
Valery Sizov 4e321ec11c Merge branch 'improve-group-members-api' into 'master' 
Improve group members api

Related #1720

See merge request !1225
 2014-10-29 13:42:56 +00:00
Jacob Vosmaer 5747189481 Add CHANGELOG entry for sequence drop 2014-10-29 13:38:43 +01:00
Dmitriy Zaporozhets a565c51b86 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-29 13:41:29 +02:00
Dmitriy Zaporozhets 93bed4435e Merge pull request #8060 from dblessing/feature/bamboo_service 
Add Atlassian Bamboo service
 2014-10-29 13:41:13 +02:00
Dmitriy Zaporozhets eea6a8a17d Dont allow guests..developers to manage group members 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 13:38:00 +02:00
Dmitriy Zaporozhets f6491508fe Split group members api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 13:31:23 +02:00
Jacob Vosmaer 527bbd44de Merge branch 'master' into 'master' 
Close #717

This closes #717:

Add documentation changes to:

 * Set the permissions of the unix socket properly
 * Create the directory for the socket
 * Make sure tmpfiles.d persists said directory

The first change makes sure gitlabl can connect to the socket. The latter two avoid redis from failing to start on systemd-based systems, including recent versions of Debian.

You may probably want to cherry-pick this into the documentation for the latest stable release.

See merge request !224
 2014-10-29 11:01:18 +00:00
Tomas Srna 733012cb65 Removed + '' + 2014-10-29 10:52:54 +01:00
Robert Schilling 7c00a841f5 Merge pull request #8187 from bbodenmiller/patch-4 
minor requirements.md cleanup
 2014-10-28 23:04:40 +01:00
Dmitriy Zaporozhets d6db6dda75 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-28 20:02:40 +02:00
Dmitriy Zaporozhets fa39863611 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-28 20:02:01 +02:00
Sytse Sijbrandij 1d0f638248 Don't update GitLab Shell to the latest version but to the corresponding version. 2014-10-28 10:57:30 -07:00
Jacob Vosmaer e00e67db42 Drop all Postgres sequences during backup restore 2014-10-28 18:52:21 +01:00
Patricio Cano d9023da90d Refactored password_strength configuration 2014-10-28 12:48:20 -05:00
Ben Bodenmiller dc4caa26bf minor requirements.md cleanup 
* "Non Unix"->"Non-Unix"
* Fix poor wording
 2014-10-28 09:47:57 -07:00
Patricio Cano bf07fcf06a Removed unnecessary role in form. 2014-10-28 11:04:46 -05:00
Patricio Cano 9397d19380 Added ID to the form-group, to fix alignment of inputs 2014-10-28 11:02:36 -05:00
Dmitriy Zaporozhets 1ad78be981 Merge branch 'transfer-service-spec-cleanups' into 'master' 
Transfer service spec cleanups

Simplify the current tests for Projects::TransferService

See merge request !208
 2014-10-28 14:19:27 +00:00
Dmitriy Zaporozhets c71792d98c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-28 16:15:31 +02:00
Dmitriy Zaporozhets d0ebdedf98 Merge branch 'mr-vinn/gitlab-ce-api-project-delete' 2014-10-28 16:14:46 +02:00
Dmitriy Zaporozhets 576a80e97c Merge branch 'api-project-delete' of https://gitlab.com/mr-vinn/gitlab-ce into mr-vinn/gitlab-ce-api-project-delete 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/projects_spec.rb
 2014-10-28 16:14:40 +02:00
Dmitriy Zaporozhets f3c120d25a Add failing test that should be green after group members api get fixed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-28 16:00:03 +02:00
Dmitriy Zaporozhets 9306d8fca2 Merge branch 'dashboard_issues_and_mr' into 'master' 
Dashboard issues and merge request filters

Fixes #1597

See merge request !1219
 2014-10-28 13:38:41 +00:00
Dmitriy Zaporozhets eaebc20eba Merge branch 'disable_email_option' into 'master' 
Disable email option

Fixes #1569

See merge request !1222
 2014-10-28 13:36:28 +00:00
Dmitriy Zaporozhets 2a16bbd626 Merge pull request #7572 from mr-vinn/application-js-fix 
Handle undefined text area values
 2014-10-28 15:23:45 +02:00
Dmitriy Zaporozhets ec4a079099 Merge pull request #7976 from bbodenmiller/patch-9 
support latest firefox esr release
 2014-10-28 14:07:42 +02:00
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05:00
Dmitriy Zaporozhets b23b78ada1 Merge pull request #7866 from cirosantilli/input-button-to-tag 
Use button type=submit instead of input.
 2014-10-28 12:11:15 +02:00
Dmitriy Zaporozhets beabf5db8c Merge pull request #8091 from cirosantilli/factor-ability-abilities 
Factor abilities methods
 2014-10-28 12:09:55 +02:00
Dmitriy Zaporozhets 26175e4459 Merge pull request #8127 from cirosantilli/user-select-js-only-needed 
Run user select Js only where needed
 2014-10-28 12:08:57 +02:00