summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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-063-7/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #8800 from jirutka/email-settingsDmitriy Zaporozhets2015-05-063-7/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | | Allow to configure smtp and sendmail in gitlab.yml
| | * | | | Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-063-7/+7
| | | | | |
* | | | | | 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>
* | | | | When use change branches link at MR form - save source branch selection ↵mr-change-branchesDmitriy Zaporozhets2015-05-062-1/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | instead of target one Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | 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 'refactor-project-page' into 'master'Dmitriy Zaporozhets2015-05-068-191/+152
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | 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>
| * | | 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-051-5/+0
| | | | | | | | | | | | | | | | 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 '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
| | |/ | |/|
* | | Improve help line for restricted domain signupsStan Hu2015-05-051-1/+1
|/ /
* | fix gitlab CI linksfix_ci_servicesValery Sizov2015-05-051-2/+2
|/
* Merge branch 'fix-wiki-search' into 'master'Dmitriy Zaporozhets2015-05-041-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-0/+2
| | | | | | | | Closes #1547
* | Merge branch 'fix-escaped-branches-in-compare' into 'master'Douwe Maan2015-05-041-2/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Unescape branch names in compare commitStan Hu2015-04-301-2/+4
| |/ | | | | | | | | Closes #1399 Closes https://github.com/gitlabhq/gitlabhq/issues/9105
* | Re-annotate modelsStan Hu2015-05-0318-22/+46
| |
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling2015-05-0312-51/+105
|\ \
| * \ Merge pull request #9234 from dsander/group-milestones-by-titleDmitriy Zaporozhets2015-05-034-30/+7
| |\ \ | | | | | | | | Group milestones by title in the dashboard and all other issue views
| | * | Group milestones by title in the dashboard and all other issue viewsDominik Sander2015-05-013-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This groups milestones by title for issue views like it has been done for the milestone dashboard/project overview. Before milestones with the same title would show up multiple times in the filter dropdown and one could only filter per project and milestone. Now the milestone filter is based on the title of the milestone, i.e. all issues marked with the same milestone title are shown.
| | * | Removed unused ApplicationController#set_filter_values methodDominik Sander2015-05-011-25/+0
| | | | | | | | | | | | | | | | | | | | The instance variables assigned in `set_filter_values` are not used by anything anymore.
| * | | Merge branch 'change-primary-email' into 'master'Dmitriy Zaporozhets2015-05-035-18/+45
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow primary email to be set to an email that you've already added. Fixes gitlab-com/support-forum#106. When the user sets their primary email to an email that they've already added to their account, this patch makes sure that secondary email record is destroyed, and a new email record is created for the old primary email. This is based on the assumption that in this case no email was meant to be deleted, but the user simply wanted to change which of their emails is primary. See merge request !591
| | * | | Allow primary email to be set to an email that you've already added.change-primary-emailDouwe Maan2015-04-305-18/+45
| | | |/ | | |/|
| * | | Merge branch 'restrict-signups-to-domains' into 'master'Dmitriy Zaporozhets2015-05-034-3/+53
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add application setting to restrict user signups to e-mail domains This feature was requested long ago: http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains This MR is based off !253 but changed to use application settings and use wildcard strings to give more flexibility in pattern matching. Regexps seemed overkill and prone to mistakes. Also note that validation is ONLY done on creation to prevent breaking existing users who do not have a whitelisted domain. However, this allows a user to sign-up and change his/her email to a non-whitelisted domain. Screenshots: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b312046aae03971f37f4247382971fc6/image.png) ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/94bdf3ffaf37c2e8324eff83308f81f0/image.png) See merge request !598
| | * | | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-024-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature was requested long ago: http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains This MR is based off !253 but changed to use application settings and use wildcard strings to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong. Only restrict e-mail addresses upon creation
* | | | | Add period at snippet visibilty descriptionRobert Schilling2015-05-031-1/+1
|/ / / /
* | | | Merge branch 'make-reply-to-work-everywhere' into 'master'Robert Speicher2015-05-021-0/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Reply-To config apply to change e-mail confirmation and other notifications sent through Devise Notifications sent through Devise were using the default From: address, and due to a broken test line nothing was actually being run. The only way to customize the Devise Reply-To field is to use a custom mailer. Moved the e-mail configuration out of the initializers to accommodate this. Closes #1556 See merge request !596
| * | | Make Reply-To config apply to change e-mail confirmation and other notificationsStan Hu2015-05-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sent through Devise Fix test case that was passing due to a broken `around` statement. Closes #1556
* | | | Merge branch 'you-get-a-title-and-you-get-a-title-and-everyone-gets-a-title' ↵Dmitriy Zaporozhets2015-05-02204-411/+434
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add a page title to every page. ![You get a title, and you get a title; everyone gets a title!](https://i.imgflip.com/kvmq8.jpg) The `page_title` helper pushes the provided string at the end of the title, but because of the order that layouts are rendered in by ActionView, the result is always this: ``` <title from view> | <title from as specified in the controller or by its layout> | <title from layouts/_head> ``` For example: `Merge Requests | GitLab.org / Gitlab Community Edition | GitLab`. All a developer needs to know is to put a `page_title` call describing the page in question at the start of every template. To get everything where I wanted it to go without too much duplication, I had to make some changes around layouts, sidebars and controllers. See merge request !593
| * | | | Fix title on user page.you-get-a-title-and-you-get-a-title-and-everyone-gets-a-titleDouwe Maan2015-05-012-3/+3
| | | | |
| * | | | Add helpers for header title and sidebar, and move setting those from ↵Douwe Maan2015-05-0133-129/+112
| | | | | | | | | | | | | | | | | | | | controllers to layouts.
| * | | | Capitalize "X" in "New X".Douwe Maan2015-04-3012-12/+12
| | | | |
| * | | | Set head panel title of help section.Douwe Maan2015-04-303-2/+8
| | | | |
| * | | | Humanize help page titles.Douwe Maan2015-04-301-1/+1
| | | | |
| * | | | Have tree page title read "Files" for root.Douwe Maan2015-04-301-1/+1
| | | | |