Commit Graph
14039 Commits
Author SHA1 Message Date
Jacob Vosmaer e5cf5f4f98 Notes have noteables but no commits 2014-04-28 11:50:21 +02:00
Jacob Vosmaer 410790a355 Add NotesFinder spec 2014-04-28 11:48:18 +02:00
Job van der Voort f7da04dccd Merge pull request #6884 from xystudioo/master
fix init.d script copy duplication
2014-04-27 16:27:58 +02:00
Xiaoyu Tai 5ac015664d init.d script copy duplication
Copy init.d script twice in the guide. Deleted the second one.
2014-04-27 20:25:35 +08:00
Michael Krane a5e20638c2 Satellites access fix 2014-04-27 11:36:45 +02:00
Dmitriy Zaporozhets 27f31a7e3a Merge branch 'update/6.0-to-6.8' into 'master'
Replace 6.0-to-6.7.md with 6.0-to-6.8.md
2014-04-27 08:28:25 +00:00
arantir 292c3c210b Typo fix 2014-04-27 00:16:50 +03:00
Nico Suhl 25cc5fbf78 do not html encode plaintext part of emails for push notifications
Also-by: Andrew Karpow <andy@ndyk.de>
2014-04-26 03:43:24 +02:00
Drew Blessing 4618ec8791 Fix unclear text in broadcast message view. 2014-04-25 15:31:30 -05:00
Sytse Sijbrandij 3657e95195 Merge pull request #6868 from cppcho/Confiure
Fix typo: Confiure -> Configure
2014-04-25 16:12:40 +02:00
Jacob Vosmaer bdd392bd13 Use gitlab-shell 1.9.3 2014-04-25 15:03:32 +02:00
Jacob Vosmaer 95ef25a57a Replace 6.0-to-6.7.md with 6.0-to-6.8.md 2014-04-25 15:01:46 +02:00
Cho Cheuk Ping 1eed896578 Fix typo: Confiure -> Configure 2014-04-25 18:49:21 +08:00
Jacob Vosmaer b4b6447b55 Merge pull request #6857 from bytheway/master
Add scoping to ldap lookup when only dn given
2014-04-25 10:48:28 +02:00
Dmitriy Zaporozhets e4c8e8fd76 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce 2014-04-25 08:23:14 +02:00
Dmitriy Zaporozhets e55d047aa4 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-25 08:22:32 +02:00
Dmitriy Zaporozhets 9653ddf693 Merge branch 'rake_setup' into 'master'
rake setup

Add alias `rake setup` to `rake gitlab:setup`
Mention in developer docs
2014-04-25 06:04:39 +00:00
Dmitriy Zaporozhets 1f84518ab7 Merge branch 'index_on_iid' into 'master'
Add uniq db index on project_id+iid

Because:
* its faster
* it solves problem with repeating iid's in one project
2014-04-25 06:03:03 +00:00
Adam Engebretson ccdf7a329a Added Laravel API Wrapper 2014-04-25 03:38:54 +00:00
Dmitriy Zaporozhets 5dd4fb82e8 Merge pull request #6847 from Philzen/patch-2
gitlab.yml description Typo
2014-04-24 20:56:30 +03:00
Dmitriy Zaporozhets 7e10d10178 Add doc file for dev rake tasks 2014-04-24 19:53:18 +02:00
Dmitriy Zaporozhets 2eaca54536 Add rake setup alias for gitlab:setup 2014-04-24 19:53:00 +02:00
Dmitriy Zaporozhets d89f26e011 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-24 19:41:34 +02:00
Dmitriy Zaporozhets ae7bd9f7c0 Migrate invalid rows with missing iids or duplicates 2014-04-24 19:39:33 +02:00
Dmitriy Zaporozhets 3bf1cff421 Add iids changelog entry 2014-04-24 19:39:33 +02:00
Dmitriy Zaporozhets c46a061270 Add uniq db index on project_id+iid 2014-04-24 19:39:09 +02:00
Dmitriy Zaporozhets 2a99f18478 Merge branch 'mysql_field_limits' into 'master'
Adjust MySQL limits for existing installations
2014-04-24 17:37:38 +00:00
Dmitriy Zaporozhets f5b88710ea Merge branch 'tests_for_fog' into 'master'
Tests for fog
2014-04-24 17:01:49 +00:00
Job van der Voort edc32047dc start to make the monthly release doc a step by step guide 2014-04-24 17:17:23 +02:00
Chenguang Zhang 84870438f9 Add support for side-by-side inline comments 2014-04-24 21:18:10 +08:00
Marin Jankovski 0050c07fdd Serve a file if in wiki. 2014-04-24 15:00:18 +02:00
Marin Jankovski fe1ca61601 Make sure that tests pass when aws group is used. 2014-04-24 13:23:17 +02:00
Sytse Sijbrandij 800aacef56 Merge branch 'fix-grammar-help-webhooks' into 'master'
Fix grammar and typos in Webhooks help

This MR gets rid of some typos and wrong grammar in [help/web_hooks](https://gitlab.com/help/web_hooks).
2014-04-24 06:58:57 +00:00
Dmitriy Zaporozhets 728bdfc504 Merge pull request #6843 from evanlucas/bug/6546
Fix syntax highlighting
2014-04-24 09:38:44 +03:00
Dmitriy Zaporozhets 1feaa336ed Merge pull request #6848 from hszcg/master
Fix diff height
2014-04-24 09:22:31 +03:00
Ben Bytheway de794b6a77 Add scoping to ldap lookup when only dn given 2014-04-23 21:00:56 -06:00
Philipp Hansch a4bf8037fb Multiple grammar/typo fixes in web hooks help 2014-04-23 21:00:26 +02:00
Achilleas Pipinellis d1648a6a21 Ensure git user can create the database. Fix #175 2014-04-23 21:58:58 +03:00
Chenguang Zhang 7dd0860e5a Remove fixed height for diff table 2014-04-23 23:02:25 +08:00
Dmitriy Zaporozhets e54b457ea3 Improve ssh_host settings 2014-04-23 16:22:49 +02:00
Dmitriy Zaporozhets 2134e18ec6 Fix default ssh_host setting 2014-04-23 16:19:59 +02:00
Marin Jankovski 7c5b61224a We are at 6.9.0.pre. 2014-04-23 15:50:05 +02:00
Dmitriy Zaporozhets b8d3148311 Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 2014-04-23 09:22:49 +00:00
Dmitriy Zaporozhets 7c1c03888c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce 2014-04-23 09:21:52 +00:00
Jacob Vosmaer b810ef1099 Merge branch 'bump_gitlab_shell' into 'master'
Bump gitlab shell
2014-04-23 09:20:33 +00:00
Jacob Vosmaer 77e565d347 Bump the required gitlab-shell version to 1.9.3 2014-04-23 11:13:21 +02:00
Dmitriy Zaporozhets 3bb8c17cc3 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-23 09:09:45 +00:00
Jacob Vosmaer acebfdc7b1 Move changelog entries to 6.9.0 2014-04-23 11:09:38 +02:00
Jacob Vosmaer cd61239540 Move the adapter check to the migration 2014-04-23 11:08:51 +02:00
Jacob Vosmaer 43e77099d8 Adjust MySQL limits for existing installations 2014-04-23 11:07:36 +02:00