summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Make view link come first so I don't have to mouse to the end of the email line.Sytse Sijbrandij2015-01-142-3/+3
| | | |/ | | |/|
| * | | Merge branch 'fix-scroll-issue' into 'master'Dmitriy Zaporozhets2015-01-151-0/+10
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | Fix scroll issue Fixes #1886 See merge request !1396
| | * Fix anchors being hidden under fixed navbar issueDmitriy Zaporozhets2015-01-141-0/+10
| |/
| * Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-01-141-1/+1
| |\
| * | Improve layout cssDmitriy Zaporozhets2015-01-147-13/+10
| | |
* | | Version 7.7.0.rc1v7.7.0.rc1Dmitriy Zaporozhets2015-01-141-1/+1
| |/ |/|
* | Fix code block in rc1 docDmitriy Zaporozhets2015-01-151-1/+1
|/
* Remove bold textDmitriy Zaporozhets2015-01-141-3/+3
|
* Update guides for CEDmitriy Zaporozhets2015-01-141-9/+9
|
* Create update doc for 7.7Dmitriy Zaporozhets2015-01-141-0/+114
|
* Revert "Fix tests"Dmitriy Zaporozhets2015-01-141-1/+1
| | | | This reverts commit 1e45ba7f169781d7c1d79fdfcee14760558db253.
* Revert "Fix anchor issue with fixed navbar"Dmitriy Zaporozhets2015-01-147-30/+8
| | | | This reverts commit 204b3c121cb038c5825dff3fa877ae2eea15403b.
* Merge branch 'fix-anchor-bug' into 'master'Dmitriy Zaporozhets2015-01-158-9/+31
|\ | | | | | | | | | | | | | | Fix anchor bug Fixes #1886 See merge request !1395
| * Fix testsDmitriy Zaporozhets2015-01-141-1/+1
| |
| * Fix anchor issue with fixed navbarDmitriy Zaporozhets2015-01-147-8/+30
|/ | | | | When use anchors - conetent gets hidden under navbar. This commit fixes with hack using margin+height combination
* Revert "Scroll the readme anchors below the navbar."Dmitriy Zaporozhets2015-01-142-29/+0
| | | | This reverts commit b1792d9e4c28366ecc896e36d22099ab564c150f.
* Revert "When anchor is clicked set the correct condition."Dmitriy Zaporozhets2015-01-142-10/+6
| | | | This reverts commit 5140bd88247125e24090a45be920b509b0fcf958.
* Merge branch 'rescue_database_error' into 'master'Dmitriy Zaporozhets2015-01-141-1/+12
|\ | | | | | | | | | | | | | | Rescue database error We need to check which database is setup but we cannot assume that the database exists already. Not checking this will break rake gitlab:setup for packaging as we need to do asset precompile before the database exists. See merge request !1393
| * Rescue database error in application settings if the database still doesn't ↵Marin Jankovski2015-01-141-1/+12
| | | | | | | | exist.
* | Merge branch 'enable-signup' into 'master'Dmitriy Zaporozhets2015-01-142-1/+2
|\ \ | |/ |/| | | | | | | Enable signup by default See merge request !1394
| * Enable signup by defaultJacob Vosmaer2015-01-142-1/+2
|/
* Merge branch 'doorkeeper_update' into 'master'Dmitriy Zaporozhets2015-01-142-3/+3
|\ | | | | | | | | | | | | | | Doorkeeper update https://gitlab.com/gitlab-org/omnibus-gitlab/issues/398 See merge request !1392
| * doorkeeper updateValery Sizov2015-01-132-3/+3
| |
* | Cleanup CHANGELOGDmitriy Zaporozhets2015-01-131-22/+3
| |
* | Merge branch 'gitlab_shell_bump' into 'master'Dmitriy Zaporozhets2015-01-131-1/+1
|\ \ | |/ |/| | | | | | | Gitlab shell bump See merge request !1391
| * gitlab-shell bumpValery Sizov2015-01-131-1/+1
|/
* Merge branch 'oauth_api_doc' into 'master'Dmitriy Zaporozhets2015-01-133-0/+122
|\ | | | | | | | | | | | | | | OAuth2 API documentation https://dev.gitlab.org/gitlab/gitlabhq/issues/1713 See merge request !1388
| * OAuth API documentation updateValery Sizov2015-01-123-0/+122
| |
* | Improve github import page UIDmitriy Zaporozhets2015-01-134-23/+28
| |
* | Update changelogDmitriy Zaporozhets2015-01-131-1/+1
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-01-131-0/+1
|\ \
| * \ Merge branch 'prose-requirement' into 'master'Sytse Sijbrandij2015-01-131-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prose requirement Feel free to improve or link to authoritative source. See merge request !285
| | * | Link to guidelines for interface text.Sytse Sijbrandij2015-01-131-1/+1
| | | |
| | * | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into prose-requirementSytse Sijbrandij2015-01-1046-350/+637
| | |\ \
| | * | | User interface text guideline added.prose-requirementSytse Sijbrandij2015-01-071-0/+1
| | | | |
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-01-131-0/+8
|\ \ \ \ \
| * | | | | Get rid of here links and simplify text.Sytse Sijbrandij2015-01-131-9/+4
| | | | | |
| * | | | | Merge branch 'improve_readme_to_website' into 'master'Sytse Sijbrandij2015-01-131-0/+13
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve readme to website addresses some of https://dev.gitlab.org/gitlab/organization/issues/100. See merge request !1355
| | * | | | revise wording to clarify CE and EE definitionsMarc Radulescu2015-01-131-3/+7
| | | | | |
| | * | | | remove duplication by linking EE features directly to websiteMarc Radulescu2015-01-121-8/+5
| | | | | |
| | * | | | add EE features list and useful links to readme file in gitlabMarc Radulescu2014-12-261-0/+12
| | | | | |
* | | | | | Update db schemaDmitriy Zaporozhets2015-01-131-1/+1
| | | | | |
* | | | | | Merge branch 'github_importer'Dmitriy Zaporozhets2015-01-1318-5/+410
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Conflicts: app/helpers/projects_helper.rb
| * | | | | Improve import pageDmitriy Zaporozhets2015-01-131-4/+5
| | | | | |
| * | | | | rspec fixValery Sizov2015-01-101-0/+1
| | | | | |
| * | | | | Github ImporterValery Sizov2015-01-1019-5/+408
| | | | | |
* | | | | | Merge pull request #8540 from yglukhov/wiki-historyDmitriy Zaporozhets2015-01-132-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | First entry in wiki history leads to newest revision.
| * | | | | | First entry in wiki history leads to newest revision.yglukhov2015-01-132-2/+8
| | | | | | |
* | | | | | | Merge branch 'scroll_below_the_navbar' into 'master'Dmitriy Zaporozhets2015-01-132-0/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scroll below the navbar Fixes #1866 Show the markdown anchors by scrolling below the fixed top navbar. See merge request !1390
| * | | | | | | When anchor is clicked set the correct condition.Marin Jankovski2015-01-132-6/+10
| | | | | | | |