summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'nice-scroll-sidebar' into 'master'Dmitriy Zaporozhets2015-07-143-2/+4
|\ | | | | | | | | | | | | | | 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-143-2/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Hide scrollbar from sidebar when external mouse is connected to OSXKamil Trzcinski2015-07-141-1/+2
|/
* Merge branch 'rs-issue-1773' into 'master'Dmitriy Zaporozhets2015-07-144-17/+31
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-134-6/+6
| |
| * Refactor Mentionable#notice_added_referencesRobert Speicher2015-07-131-11/+25
| | | | | | | | | | | | | | It now accounts for models that have changed but have already been persisted, such as when called from an UpdateService. Closes #1773
* | Merge branch 'project-default-view' into 'master'Dmitriy Zaporozhets2015-07-1410-38/+69
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1310-38/+69
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | 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>
* | 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>
* 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-131-0/+1
|\ | | | | | | | | | | | | | | 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-121-0/+1
| |
* | 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
| | | |
* | | | Merge branch 'rs-disable-2fa-by-admin' into 'master'Dmitriy Zaporozhets2015-07-132-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admins to disable 2FA for a user > ![Screen_Shot_2015-07-10_at_5.19.13_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3f9bb7c783110d2689c282879cb4b061/Screen_Shot_2015-07-10_at_5.19.13_PM.png) Depends on !961 See merge request !962
| * | | | Add a button to Admin::Users#show to disable 2FA for that userrs-disable-2fa-by-adminRobert Speicher2015-07-101-0/+1
| | | | |
| * | | | Add disable_two_factor route for Admin::UsersRobert Speicher2015-07-101-0/+6
| | | | |
* | | | | Merge branch 'rs-disable-2fa' into 'master'Dmitriy Zaporozhets2015-07-132-7/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add User#disable_two_factor! This method encapsulates all the logic for disabling 2FA on a specific User model. See merge request !961
| * | | | Add User#disable_two_factor!rs-disable-2faRobert Speicher2015-07-102-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | This method encapsulates all the logic for disabling 2FA on a specific User model.
* | | | | Merge branch 'fix-api-project-transfer' into 'master'Dmitriy Zaporozhets2015-07-133-13/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix transferring of project to another group using the API. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2397. See merge request !926
| * | | | | Fix transferring of project to another group using the API.Douwe Maan2015-07-113-13/+12
| | | | | |
* | | | | | Merge branch 'hsts-check-port-443' into 'master'Marin Jankovski2015-07-131-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only enable HSTS header for HTTPS and port 443 ### What does this MR do? This MR adds a check that the port used is 443, in addition to HTTPS being enabled, when activating the HSTS header. ### Why was this MR needed? If a user is using a non-standard port for SSL, enabling this header would send clients to port 443 when that port is invalid. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9449 See merge request !966
| * | | | | | Only enable HSTS header for HTTPS and port 443Stan Hu2015-07-121-1/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9449
* | | | | | Merge branch 'search-git-grep' into 'master'Dmitriy Zaporozhets2015-07-123-0/+36
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement faster search of code (via git grep) Much faster than iterating over each file using rugged. Performance compare for Linux repository using keyword `sha`: ``` OLD: 250 seconds NEW: 9 seconds ``` See merge request !957
| * | | | | Add tests for repository search filesDmitriy Zaporozhets2015-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Fix search blobs for wikiDmitriy Zaporozhets2015-07-123-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Implement search of code via git grepsearch-git-grepDmitriy Zaporozhets2015-07-102-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Better handle unknown projects and groups for autocompleteStan Hu2015-07-111-14/+23
| |/ / / / |/| | | |
* | | | | Merge branch 'fix-autocomplete-with-public-projects' into 'master'Hannes Rosenögger2015-07-111-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix user autocomplete for unauthenticated users accessing public projects Closes #1955 See merge request !963
| * | | | | Fix user autocomplete for unauthenticated users accessing public projectsStan Hu2015-07-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Closes #1955
* | | | | | Do not add the same icon multiple times to dropzonesDaniel Gerhardt2015-07-101-3/+3
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Some DOM queries were to broad which caused paperclip icons and spinners to be added multiple times to a dropzone in case of multiple dropzones on a page.
* | | | | Merge branch 'fix-migrating-from-svn-doc-link' into 'master'Stan Hu2015-07-101-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix migrating from SVN document link Closes #1959 See merge request !958
| * | | | Fix migrating from SVN document linkStan Hu2015-07-101-1/+1
| |/ / / | | | | | | | | | | | | Closes #1959
* | | | Smaller font and leing height for sidebar elementsDmitriy Zaporozhets2015-07-101-6/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Make edit/remove label buttons smallerlabels-small-buttonsDmitriy Zaporozhets2015-07-101-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'fork_visibility_level' into 'master'Dmitriy Zaporozhets2015-07-104-1/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forks should not have more permissive visibility levels than the original https://dev.gitlab.org/gitlab/gitlabhq/issues/2286 See merge request !936
| * | | | Fork visibility level fixfork_visibility_levelValery Sizov2015-07-064-1/+18
| | | | |