summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make migrations reversiblefix_migrationValery Sizov2015-05-072-2/+9
|
* Fix spelling error, thanks MarkSytse Sijbrandij2015-05-071-2/+2
|
* Update upgrader doc to point to 7.10.2Job van der Voort2015-05-071-4/+4
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-05-073-1/+19
|\
| * Merge branch 'fix-default-branch' into 'master'Douwe Maan2015-05-073-1/+19
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the first branch pushed to an empty repository the default HEAD In an empty repository, pushing a new branch not called "master" would leave HEAD in an unknown state, causing ambiguity if another branch were pushed. This could in turn cause a new protected branch to be created and cause the default branch to change. * Closes #1561 * Closes #1576 * Closes https://github.com/gitlabhq/gitlabhq/issues/8883 See merge request !614
| | * Make the first branch pushed to an empty repository the default HEAD.Stan Hu2015-05-053-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an empty repository, pushing a new branch not called "master" would leave HEAD in an unknown state, causing ambiguity if another branch were pushed. This could in turn cause a new protected branch to be created and cause the default branch to change. * Closes #1561 * Closes #1576 * Closes https://github.com/gitlabhq/gitlabhq/issues/8883
* | | Document sidekiq restarting functionality.Sytse Sijbrandij2015-05-071-0/+6
| | |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSytse Sijbrandij2015-05-070-0/+0
|\ \ \ | |/ / |/| |
| * | Merge branch 'revert-bad-mr' into 'master'Job van der Voort2015-05-071-1/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | revert bad link in documentation See merge request !1808
| | * | revert bad link in documentationJob van der Voort2015-05-071-1/+0
| |/ /
| * | Merge branch 'Added_link_reset_root_password' into 'master'Job van der Voort2015-05-071-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added link reset root password Added text to link "How to reset root password" cc/ @sytse See merge request !1799
| | * | Added link to document "Reset root password"Karen Carias2015-05-011-1/+1
| | | |
| | * | Added link to separate file about how to reset root passwordKaren Carias2015-04-281-2/+3
| | | |
| | * | updated one letterKaren Carias2015-04-271-1/+1
| | | |
| | * | Added text "How to reset your root password to menu"Karen Carias2015-04-271-2/+2
| | | |
* | | | Remove the volumes from the single image to keep it simple.Sytse Sijbrandij2015-05-073-26/+6
|/ / /
* | | No need to commit when using a dockerfile.Sytse Sijbrandij2015-05-071-4/+4
| | |
* | | Ignore mounted Docker directories.Sytse Sijbrandij2015-05-071-0/+3
| | |
* | | Cleanup the order of the docker manual a bit more.Sytse Sijbrandij2015-05-071-7/+13
| | |
* | | Put the retrieval of published images first.Sytse Sijbrandij2015-05-071-44/+37
| | |
* | | Add headers and reduce duplication.Sytse Sijbrandij2015-05-071-40/+32
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-05-072-2/+23
|\ \ \
| * \ \ Merge branch 'rs-issue-1348' into 'master'Robert Speicher2015-05-072-2/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Markdown feature specs for markup inside links It was already working, just want to make sure we don't break it in the future. See merge request !619
| | * | | Fix Markdown feature specRobert Speicher2015-05-061-2/+2
| | | | |
| | * | | Add Markdown feature specs for markup inside linksrs-issue-1348Robert Speicher2015-05-062-0/+21
| |/ / / | | | | | | | | | | | | | | | | It was already working, just want to make sure we don't break it in the future.
* | | | Forgot to link the third directory, thanks Ben.Sytse Sijbrandij2015-05-071-2/+2
|/ / /
* | | Make header title bold and line between header lighterDmitriy Zaporozhets2015-05-061-4/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'refactor-mr-form' into 'master'Dmitriy Zaporozhets2015-05-065-76/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor mr form * re-use issuable form for new mr page * small UI improvements to MR compare and new pages See merge request !616
| * | | Fix testsrefactor-mr-formDmitriy Zaporozhets2015-05-062-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Small UI improvements to MR formDmitriy Zaporozhets2015-05-063-5/+9
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Re-use issuable_form for new merge requestDmitriy Zaporozhets2015-05-061-69/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-0611-51/+100
|\ \ \ \
| * \ \ \ Merge pull request #8800 from jirutka/email-settingsDmitriy Zaporozhets2015-05-0611-51/+100
| |\ \ \ \ | | |/ / / | |/| | | Allow to configure smtp and sendmail in gitlab.yml
| | * | | Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-0611-51/+100
| | | | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-05-064-11/+15
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-05-064-11/+15
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small UI improvements to make project sidebar more neat * make sidebar blocks more compact * make clone panel smaller for better aspect ratio * make `forked from` section cleaner Screenshot: ![Screenshot_2015-05-06_16.42.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/69723db619ae7ae4d9551f6340d45384/Screenshot_2015-05-06_16.42.12.png) cc @rspeicher See merge request !617
| | * | | | Make README link on project home look nicerDmitriy Zaporozhets2015-05-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Small UI improvements to make project sidebar more neatDmitriy Zaporozhets2015-05-063-7/+10
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'single-docker-image' into 'master'Sytse Sijbrandij2015-05-067-31/+173
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | Single docker image See merge request !1805
| * | | | Small improvements to the dockerfile.Sytse Sijbrandij2015-05-062-3/+3
| | | | |
| * | | | Made a single docker file.Sytse Sijbrandij2015-05-067-31/+173
| |/ / /
* | | | Merge branch 'mr-change-branches' into 'master'Dmitriy Zaporozhets2015-05-063-2/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When use change branches link at MR form - save source branch selection instead of target one Fix for https://dev.gitlab.org/gitlab/gitlabhq/issues/1800 cc @jacobvosmaer See merge request !615
| * | | When use change branches link at MR form - save source branch selection ↵mr-change-branchesDmitriy Zaporozhets2015-05-063-2/+14
|/ / / | | | | | | | | | | | | | | | instead of target one Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #9248 from rumpelsepp/fix-modalRobert Schilling2015-05-061-1/+0
|\ \ \ | | | | | | | | Fix a trailing new line
| * | | Fix a trailing new lineStefan Tatschner2015-05-061-1/+0
|/ / / | | | | | | | | | | | | The "How to Merge" modal included a trailing new line in the code block. This commit removes that disfigurement.
* | | Merge pull request #9241 from Soullivaneuh/button-typeJeroen van Baarsen2015-05-064-4/+6
|\ \ \ | | | | | | | | Fix missing button types
| * | | Fix missing button typesSullivan SENECHAL2015-05-054-4/+6
| | | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-0611-219/+156
|\ \ \ \
| * \ \ \ Merge branch 'refactor-project-page' into 'master'Dmitriy Zaporozhets2015-05-0611-219/+156
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project home page usability I looked at project page and saw next problems with it: * a lot of information but not separated on blocks - hard to understand * unclear how to contribute to project Instead of complete redesign I followed step-by-step changes. ### Step 1 First of all I separated Repository and Contribution blocks. Contribution block should makes it easy for people to contribute. Even when we visit GitHub project page its not clear how to start. Our Contribution section should help with it. All repository stats and download button moved to Repository block. ![Screenshot_2015-05-05_11.49.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e69977603acfdc381acb539b19e8cba1/Screenshot_2015-05-05_11.49.16.png) ### Step 2 Next step was to make top section less loaded. I moved clone panel to sidebar because it is very heavy element and rarely used. If you use web editor - you dont even use it. If you work via http/ssh you will copy remote only once. So my idea - it should be on home page but should not be in center of attention. ![Screenshot_2015-05-05_12.47.04](https://gitlab.com/gitlab-org/gitlab-ce/uploads/41633cc8915bb12c979230567b40aea4/Screenshot_2015-05-05_12.47.04.png) See merge request !610
| | * | | Fix project testrefactor-project-pageDmitriy Zaporozhets2015-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>