summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add apple-touch-icon-precomposed.png because of 404 on iOS devicesDmitriy Zaporozhets2014-04-291-0/+0
|
* Merge branch 'master' of https://github.com/gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-293-11/+6
|\
| * Merge pull request #6884 from xystudioo/masterJob van der Voort2014-04-271-9/+3
| |\ | | | | | | fix init.d script copy duplication
| | * init.d script copy duplicationXiaoyu Tai2014-04-271-9/+3
| |/ | | | | Copy init.d script twice in the guide. Deleted the second one.
| * Merge pull request #6868 from cppcho/ConfiureSytse Sijbrandij2014-04-251-1/+1
| |\ | | | | | | Fix typo: Confiure -> Configure
| | * Fix typo: Confiure -> ConfigureCho Cheuk Ping2014-04-251-1/+1
| | |
| * | Merge pull request #6857 from bytheway/masterJacob Vosmaer2014-04-251-1/+2
| |\ \ | | | | | | | | Add scoping to ldap lookup when only dn given
| | * | Add scoping to ldap lookup when only dn givenBen Bytheway2014-04-231-1/+2
| | | |
* | | | Merge branch 'notes_finder_updated_at' into 'master'Dmitriy Zaporozhets2014-04-287-5/+62
|\ \ \ \ | | | | | | | | | | | | | | | NotesFinder filters by updated_at
| * | | | Default last_fetched_at to 0 for old clientsJacob Vosmaer2014-04-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users who have not refreshed their browser tab will poll GitLab using outdated JS. This change makes the server fall back to the old behavior (send all comments) for old clients, instead of throwing an exception for old clients.
| * | | | Add an index for Note#updated_atJacob Vosmaer2014-04-282-1/+7
| | | | |
| * | | | Serialize last_fetched_at as a string with secondsJacob Vosmaer2014-04-284-4/+4
| | | | |
| * | | | Pass last_fetched_at for notes to javascriptJacob Vosmaer2014-04-283-3/+7
| | | | |
| * | | | Always set last_fetched_at in NotesFinder specJacob Vosmaer2014-04-281-3/+3
| | | | |
| * | | | Filter out old notes in NotesFinderJacob Vosmaer2014-04-282-1/+14
| | | | |
| * | | | Fail faster on an invalid target_typeJacob Vosmaer2014-04-282-0/+7
| | | | |
| * | | | Notes have noteables but no commitsJacob Vosmaer2014-04-281-1/+1
| | | | |
| * | | | Add NotesFinder specJacob Vosmaer2014-04-281-0/+26
|/ / / /
* | | | Merge branch 'update/6.0-to-6.8' into 'master'Dmitriy Zaporozhets2014-04-271-7/+8
|\ \ \ \ | |/ / / |/| | | | | | | Replace 6.0-to-6.7.md with 6.0-to-6.8.md
| * | | Use gitlab-shell 1.9.3Jacob Vosmaer2014-04-251-1/+1
| | | |
| * | | Replace 6.0-to-6.7.md with 6.0-to-6.8.mdJacob Vosmaer2014-04-251-6/+7
|/ / /
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceDmitriy Zaporozhets2014-04-251-5/+5
|\ \ \
| * \ \ Merge branch 'fix-grammar-help-webhooks' into 'master'Sytse Sijbrandij2014-04-241-5/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | 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).
| | * | Multiple grammar/typo fixes in web hooks helpPhilipp Hansch2014-04-231-5/+5
| |/ /
* | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-251-1/+1
|\ \ \
| * \ \ Merge pull request #6847 from Philzen/patch-2Dmitriy Zaporozhets2014-04-241-1/+1
| |\ \ \ | | | | | | | | | | gitlab.yml description Typo
| | * | | # Fix description TypoPhilzen2014-04-231-1/+1
| | | | |
* | | | | Merge branch 'rake_setup' into 'master'Dmitriy Zaporozhets2014-04-253-2/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rake setup Add alias `rake setup` to `rake gitlab:setup` Mention in developer docs
| * | | | | Add doc file for dev rake tasksDmitriy Zaporozhets2014-04-242-2/+30
| | | | | |
| * | | | | Add rake setup alias for gitlab:setupDmitriy Zaporozhets2014-04-241-0/+4
| |/ / / /
* | | | | Merge branch 'index_on_iid' into 'master'Dmitriy Zaporozhets2014-04-254-0/+37
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add uniq db index on project_id+iid Because: * its faster * it solves problem with repeating iid's in one project
| * | | | Migrate invalid rows with missing iids or duplicatesDmitriy Zaporozhets2014-04-242-0/+26
| | | | |
| * | | | Add iids changelog entryDmitriy Zaporozhets2014-04-241-0/+1
| | | | |
| * | | | Add uniq db index on project_id+iidDmitriy Zaporozhets2014-04-242-0/+10
| | | | |
* | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-241-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pull request #6843 from evanlucas/bug/6546Dmitriy Zaporozhets2014-04-241-2/+2
| |\ \ \ \ | | | | | | | | | | | | Fix syntax highlighting
| | * | | | Fix syntax highlightingEvan Lucas2014-04-221-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | Don't break highlighting on multi-line spans (multi-line comments for example)
* | | | | Merge branch 'mysql_field_limits' into 'master'Dmitriy Zaporozhets2014-04-245-18/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Adjust MySQL limits for existing installations
| * | | | | Move changelog entries to 6.9.0Jacob Vosmaer2014-04-231-2/+4
| | | | | |
| * | | | | Move the adapter check to the migrationJacob Vosmaer2014-04-232-9/+2
| | | | | |
| * | | | | Adjust MySQL limits for existing installationsJacob Vosmaer2014-04-234-9/+14
| | | | | |
* | | | | | Merge branch 'tests_for_fog' into 'master'Dmitriy Zaporozhets2014-04-244-3/+20
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | Tests for fog
| * | | | | Make sure that tests pass when aws group is used.Marin Jankovski2014-04-244-3/+20
|/ / / / /
* | | | | Merge pull request #6848 from hszcg/masterDmitriy Zaporozhets2014-04-241-3/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix diff height
| * | | | Remove fixed height for diff tableChenguang Zhang2014-04-231-3/+0
| | |/ / | |/| |
* | | | Improve ssh_host settingsDmitriy Zaporozhets2014-04-231-2/+2
| | | |
* | | | Fix default ssh_host settingDmitriy Zaporozhets2014-04-231-0/+1
| | | |
* | | | We are at 6.9.0.pre.Marin Jankovski2014-04-231-1/+1
| | | |
* | | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqDmitriy Zaporozhets2014-04-231-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'bump_gitlab_shell' into 'master'Jacob Vosmaer2014-04-231-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Bump gitlab shell
View Lorry Controller Status