summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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>
| | * | Restlye project sidebar a bit to make it more clearDmitriy Zaporozhets2015-05-052-11/+16
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Fix project description and avatar alignmentDmitriy Zaporozhets2015-05-054-70/+25
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Add changelog itemDmitriy Zaporozhets2015-05-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Fix right margin for project descriptionDmitriy Zaporozhets2015-05-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Remove project dropdown and fix db sche,aDmitriy Zaporozhets2015-05-052-31/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Show CI link on project home page only if CI enabledDmitriy Zaporozhets2015-05-051-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Reorganize elements in project sidebarDmitriy Zaporozhets2015-05-055-47/+56
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Move clone panel to sidebarDmitriy Zaporozhets2015-05-054-9/+12
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Remove unnecessary info from project home pageDmitriy Zaporozhets2015-05-051-11/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Turn sidebar in sections with contribute and repositoryDmitriy Zaporozhets2015-05-053-37/+39
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Move tabs with activity/readme to sectionDmitriy Zaporozhets2015-05-052-56/+55
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Move project section to own partialDmitriy Zaporozhets2015-05-052-14/+16
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Move project sidebar to separate partialDmitriy Zaporozhets2015-05-052-53/+55
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-065-4/+9
|\ \ \ \ | |/ / /
| * | | Merge branch 'fix-devise-email-display-name' into 'master'Robert Schilling2015-05-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the configured display name in e-mails from Devise mailer By default, it is set to "GitLab", but a user may configure the display name to something else. See merge request !613
| | * | | Use the configured display name in e-mails from Devise mailerStan Hu2015-05-051-1/+1
| | | | |
| * | | | Merge branch 'improve-restricted-domains-help' into 'master'Robert Schilling2015-05-061-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve help line for restricted domain signups The setting may be misconstrued as only allowing access from certain domains. Add help to clarify this applies to e-mail domains. See merge request !612
| | * | | Improve help line for restricted domain signupsStan Hu2015-05-051-1/+1
| |/ / /
| * | | Merge branch 'fix_ci_services' into 'master'Dmitriy Zaporozhets2015-05-053-2/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI links on MR page Fixes gitlab-org/gitlab-ci#145 See merge request !609
| | * | | fix gitlab CI linksfix_ci_servicesValery Sizov2015-05-053-2/+7
| |/ / /
* | | | Fixed broken permissions link.Patricio Cano2015-05-051-4/+2
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Schilling2015-05-051-2/+2
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into 'master'Robert Schilling2015-05-051-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | Docker: update omnibus package See merge request !605
| | * | Docker: update omnibus packageJakob Englisch2015-05-041-2/+2
| | | |
* | | | Merge pull request #9238 from quodos/masterRobert Schilling2015-05-041-1/+1
|\ \ \ \ | |/ / / |/| | | Update spelling in comments in authentication.rb
| * | | Update authentication.rbquodos2015-05-041-1/+1
| | | | | | | | | | | | correct spelling
* | | | Merge branch 'improve-external-issue-tracker-config-doc' into 'master'Marin Jankovski2015-05-041-0/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation of configuring external issue trackers There was some confusion over the deprecated `:issues_tracker_id` field. Added documentation. Closes #1514 See merge request !580
| * | | Improve documentation of configuring external issue trackersStan Hu2015-05-041-0/+5
| | |/ | |/| | | | | | | Closes #1514
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-045-0/+34
|\ \ \ | |/ /
| * | Merge branch 'fix-wiki-search' into 'master'Dmitriy Zaporozhets2015-05-045-0/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when searching Wiki pages If a Wiki page turns up a hit in the search results, an error will occur: ``` Completed 500 Internal Server Error in 836ms NoMethodError - undefined method `slug' for "test.markdown":String: app/helpers/wiki_helper.rb:10:in `namespace_project_wiki_path' app/views/search/results/_wiki_blob.html.haml:4:in `_app_views_search_results__wiki_blob_html_haml___2752621660395393333_70299911622700' actionview (4.1.9) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.9) lib/active_support/notifications.rb:161:in `instrument' actionview (4.1.9) lib/action_view/template.rb:339:in `instrument' actionview (4.1.9) lib/action_view/template.rb:143:in `render' ``` An unhandled String containing the name of the Wiki page would be provided to the URL path generator. This MR handles that case. Closes #1547 See merge request !592
| | * | Fix Error 500 when searching Wiki pagesStan Hu2015-04-305-0/+34
| | | | | | | | | | | | | | | | Closes #1547
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-043-3/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #9097 from sselberg/add-current_sign_in_at-to-rest-apiDmitriy Zaporozhets2015-05-043-3/+6
| |\ \ \ | | |/ / | |/| | Add current_sign_in_at to api User
| | * | Add current_sign_in_at to api UserSven Selberg2015-05-043-3/+6
| | | |
* | | | Merge branch 'Add_doc_block_new_users_by_default' into 'master'Job van der Voort2015-05-041-0/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added " How to maintain tight control over the number of active users..." Added " How to maintain tight control over the number of active users on your GitLab installation" to documentation. Please check that documentation is OK before accepting Merge. I took if from https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example#L149 cc/ @sytse See merge request !1792
| * | | update doc by removing unnecessary partsJob van der Voort2015-05-041-29/+3
| | | |
| * | | Added " How to maintain tight control over the number of active users on ↵Karen Carias2015-04-241-0/+35
| | | | | | | | | | | | | | | | your GitLab installation" to documentation
* | | | Merge branch 'fix-escaped-branches-in-compare' into 'master'Douwe Maan2015-05-043-2/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unescape branch names in compare commit The upgrade in GitLab v7.9 to Rails v4.1.9 caused all branch names in the compare commit mode to be escaped (e.g. `/` to `%2F`). The compare mode would not always work when comparing against branch names with a forward slash. Opted to unescape the branch name rather than use a wildcard segment to prevent escaping slashes because it seems like a more sensible URL. The slashes in this case aren't really represented by a tree structure (e.g. /compare/one/two/branch..another/branch/here). * Closes #1399 * Closes https://github.com/gitlabhq/gitlabhq/issues/9105 See merge request !582