summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix docker imagedocker-imageKamil Trzcinski2015-07-142-1/+8
|
* Revert password change changelog entry.Sytse Sijbrandij2015-07-141-1/+0
|
* Revert "Change default admin password from "5iveL!fe" to "password""Sytse Sijbrandij2015-07-145-5/+5
| | | | This reverts commit 8a01a1222875b190d32769f7a6e7a74720079d2a.
* Merge branch 'notifications-title' into 'master' Job van der Voort2015-07-142-5/+3
|\ | | | | | | | | | | | | | | fixed notifications title I fixed the title and link to this document because I believe that it's more clear and easier to find if it has "emails" in the name. See merge request !1897
| * fixed notifications titlekaren Carias2015-07-132-5/+3
| |
* | Merge branch 'fix-ed' into 'master' Dmitriy Zaporozhets2015-07-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix path to move_drop_indexes.ed Small documentation fix. See merge request !1900
| * | Fix path to move_drop_indexes.edJacob Vosmaer2015-07-141-1/+1
| | |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-145-3/+124
|\ \ \
| * \ \ Merge branch 'nice-scroll-sidebar' into 'master'Dmitriy Zaporozhets2015-07-144-2/+122
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add nice scroll for sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !978
| | * | | Add nice scroll for sidebarDmitriy Zaporozhets2015-07-144-2/+122
| | |/ / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'scrollbar-issue' into 'master'Dmitriy Zaporozhets2015-07-141-1/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | Hide scrollbar from sidebar when external mouse is connected to OSX See merge request !977
| | * | Hide scrollbar from sidebar when external mouse is connected to OSXKamil Trzcinski2015-07-141-1/+2
| |/ /
* | | Merge branch 'update-guide-713' into 'master' Valery Sizov2015-07-142-11/+140
|\ \ \ | |/ / |/| | | | | | | | | | | | | | create update guides for 7.13 See merge request !1899
| * | create update guides for 7.13Job van der Voort2015-07-142-11/+140
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-142-8/+11
|\ \
| * \ Merge branch 'rs-fix-coverage' into 'master'Dmitriy Zaporozhets2015-07-142-8/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move coverage-related setup back to spec_helper These tools must be loaded before our regular Rails environment. Partially reverts 57830201a9152b56ccf65a98275601617f44653d See merge request !976
| | * | Move coverage-related setup back to spec_helperrs-fix-coverageRobert Speicher2015-07-132-8/+11
| | | | | | | | | | | | | | | | These tools must be loaded before our regular Rails environment.
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-146-18/+81
|\ \ \ \ | |/ / /
| * | | Merge branch 'rs-issue-1773' into 'master'Dmitriy Zaporozhets2015-07-146-18/+81
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mentions not being created upon issue/merge request update New cross-references weren't being added when they were made in an issue or merge request update. This happened because the relevant `UpdateService`s were making the `notice_added_references` call after the model had already been updated and saved, so the `changes` attribute was empty and no cross-references were made at all. This fixes the bug and adds a bit of testing and a bit of refactoring. Closes #1773 See merge request !974
| | * | | Rename `notice_added_references` to `create_new_cross_references!`rs-issue-1773Robert Speicher2015-07-136-12/+12
| | | | |
| | * | | Refactor Mentionable#notice_added_referencesRobert Speicher2015-07-132-11/+74
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | It now accounts for models that have changed but have already been persisted, such as when called from an UpdateService. Closes #1773
* | | | Merge branch 'mysql-to-postgres-ed' into 'master' Dmitriy Zaporozhets2015-07-141-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add 'ed' step to mysql-to-postgres procedure This change brings the documentation in this repo up to date with that in https://github.com/gitlabhq/mysql-postgresql-converter . See merge request !1896
| * | | Add 'ed' step to mysql-to-postgres procedureJacob Vosmaer2015-07-131-0/+2
| | |/ | |/| | | | | | | | | | Introduced in https://github.com/gitlabhq/mysql-postgresql-converter/commit/b2d1599706f532e1bac836243f25e005c816ef14
* | | Merge branch 'project-default-view' into 'master'Dmitriy Zaporozhets2015-07-1413-39/+82
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow user to specify content he wants to see on project page Improvement to !938. Since a lot of people complain on fact they don't like to see README. Especially since we already have a switcher for dashboard - it kind of acceptable to select behaviour. User can specify which content he/she wants to see: ![Screenshot_2015-07-13_18.24.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d237474e8f52df4a62ba7e951fa28bd8/Screenshot_2015-07-13_18.24.31.png) ![Screenshot_2015-07-13_18.24.36](https://gitlab.com/gitlab-org/gitlab-ce/uploads/473b0e2a94b3de16d048b8332b539816/Screenshot_2015-07-13_18.24.36.png) cc @JobV @jacobvosmaer @marin @sytses See merge request !970
| * | | Allow user to specify content he wants to see on project pageproject-default-viewDmitriy Zaporozhets2015-07-1313-39/+82
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'project-plus-icon' into 'master'Dmitriy Zaporozhets2015-07-132-3/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced icon for project page dropdown button Improve for !971 ![Screenshot_2015-07-13_23.37.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2b168c6f8a07f33cab4ca8f735646f8a/Screenshot_2015-07-13_23.37.01.png) See merge request !973
| * | | Improve project new item dropdownproject-plus-iconDmitriy Zaporozhets2015-07-132-3/+2
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'use_password_field_defaults_for_services' into 'master'Dmitriy Zaporozhets2015-07-132-12/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use password field defaults for services Previously we masked the password field manually. After the refactor that services page received we can use `password_field` default masking. Fixes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/314 See merge request !969
| * | | Use password field default password masking.use_password_field_defaults_for_servicesMarin Jankovski2015-07-132-12/+2
| | |/ | |/|
* | | Merge branch 'project-dropdown' into 'master'Dmitriy Zaporozhets2015-07-132-0/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dropdown to quickly create issue or branch from project page because just 'new issue' link is not valid for all users. A lot of people use external issue tracker. So I grouped several links under one button ![Screenshot_2015-07-13_18.40.43](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9db7394c16d1a8718c8a6a15fd2c98cc/Screenshot_2015-07-13_18.40.43.png) ![Screenshot_2015-07-13_18.40.41](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d880532bb15370bb3f8e76bd06b411ad/Screenshot_2015-07-13_18.40.41.png) cc @JobV @marin @jacobvosmaer @sytses See merge request !971
| * | | Better wording for project dropdownDmitriy Zaporozhets2015-07-131-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add dropdown to quickly create issue or branch from project pageDmitriy Zaporozhets2015-07-132-0/+35
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'scroll-sidebar' into 'master'Dmitriy Zaporozhets2015-07-132-9/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scroll sidebar On small screens content of sidebar does not fit. This merge request makes sidebar scrollable which makes it usable for tablets and small laptops. This merge request has no screenshot because it brings no visual change. Its about action. cc @darby @JobV See merge request !972
| * | | Increase padding between menu items a bitDmitriy Zaporozhets2015-07-131-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Make sidebar scrollable. It prevents content overflow for small screensDmitriy Zaporozhets2015-07-132-8/+6
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'revert-relative-doc-link' into 'master'Achilleas Pipinellis2015-07-131-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Revert "use relative link to SSH setup page" This broke on GitLab.com. This reverts commit f876ef6e4db9c5ece17d3bd5c7c8a4e31d9374b3. See merge request !952
| * | Revert "use relative link to SSH setup page"Stan Hu2015-07-091-1/+1
| | | | | | | | | | | | This reverts commit f876ef6e4db9c5ece17d3bd5c7c8a4e31d9374b3.
* | | Revert "added link to issue closing pattern in doc"Sytse Sijbrandij2015-07-131-2/+0
| |/ |/| | | | | This reverts commit 903daedb5a963d55f8b2e836127958f92a1562a5.
* | Merge branch 'no-icon-for-back' into 'master'Dmitriy Zaporozhets2015-07-136-6/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide icon for bact-to-location menu in sidebar cc @JobV ![Screenshot_2015-07-13_11.37.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/39d871b6a0e0e555cb497aee865a2f45/Screenshot_2015-07-13_11.37.39.png) See merge request !968
| * | Hide icon for bact-to-location menu in sidebarDmitriy Zaporozhets2015-07-136-6/+12
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'ssh-key-linebreaks' into 'master'Dmitriy Zaporozhets2015-07-133-1/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | Add error message for SSH key linebreaks Solves this [request](http://feedback.gitlab.com/forums/176466-general/suggestions/5653544-check-for-linebreaks-in-ssh-key). See merge request !672
| * | Add error message for SSH key linebreaksNikita Verkhovin2015-07-123-1/+9
| | |
* | | Merge branch 'rs-issue-1908' into 'master'Dmitriy Zaporozhets2015-07-136-2/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Safari/iOS and Windows 8 logo information Now that we've got our :fire: new logo, let's spread it around a bit more! Closes #1908 See merge request !944
| * | | Update msapplication-TileColor valuers-issue-1908Robert Speicher2015-07-101-1/+1
| | | |
| * | | Update background color for touch-icon-* imagesRobert Speicher2015-07-104-0/+0
| | | |
| * | | Add Windows 8 pinned site tile meta tagsRobert Speicher2015-07-092-0/+4
| | | |
| * | | Add Safari/iOS versions of the logoRobert Speicher2015-07-095-2/+13
| | | |
* | | | Merge branch 'vis_btn_color_change' into 'master'Dmitriy Zaporozhets2015-07-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the color of admin/application_settings buttons Now they look like this: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a43c0c7fada5768bddda6e3449b37a5e/image.png) gray when selected, white when not. See merge request !887
| * | | | Changed to using the btn classvis_btn_color_changeDarby2015-07-103-15/+2
| | | | |
| * | | | Changed the color of admin/application_settings buttonsDarby2015-06-242-1/+14
| | | | |
View Lorry Controller Status