summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move Changelog entry for build retry fix to 8.9.4fix/build-retry-button-in-viewGrzegorz Bizon2016-06-301-1/+1
|
* Add Changelog entry for build sidebar retry link fixGrzegorz Bizon2016-06-301-0/+1
|
* Improve method that tells if build is retryableGrzegorz Bizon2016-06-303-2/+20
| | | | | | This method now should return false if build is not completed. If build is running then it is not retryable, therefore `Ci::Build#retryable?` returned wrong value. This commit changes this behavior
* Do not show build retry link when build is activeGrzegorz Bizon2016-06-302-1/+38
|
* Merge branch '19003-file-view-subnav' into 'master' Dmitriy Zaporozhets2016-06-302-7/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Sub nav isn't showing on file view" ## What does this MR do? Adds subnav to `Repository` > `File` view ## What are the relevant issue numbers? Closes #19003 Part of #18844 ## Screenshots (if relevant) ![Screen_Shot_2016-06-23_at_5.33.05_PM](/uploads/aa6993b2376dbe454af87d852aa74f5e/Screen_Shot_2016-06-23_at_5.33.05_PM.png) cc @dzaporozhets See merge request !4890
| * Move changelot item "Add sub nav to file page view" to 8.9.4Dmitriy Zaporozhets2016-06-301-2/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix changelog for 8.9.3Dmitriy Zaporozhets2016-06-301-1/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Update CHANGELOGAnnabel Dunstone2016-06-301-0/+3
| |
| * Add sub nav to file viewAnnabel Dunstone2016-06-301-7/+10
|/
* Merge branch 'fix_filebrowser_reload' into 'master' Fatih Acet2016-06-302-3/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File Browser navigation fixes Fixes a double request being made when clicking the file name when navigating through file browser and also fixes opening a file in a new tab or when doing ctrl + click. Closes #19050 **Before** ![navigation-old](/uploads/f9a40c91e430e31beae3a896cffb1c68/navigation-old.gif) **After** ![navigation](/uploads/dec9b43894c00cc09d80d19c83506530/navigation.gif) See merge request !4891
| * Update CHANGELOGfix_filebrowser_reloadAlfredo Sumaran2016-06-291-0/+3
| |
| * Fixes opening files on a new tab with meta key + click or using mouse middle ↵Alfredo Sumaran2016-06-291-2/+6
| | | | | | | | button
| * Skip element that is wrapped by a linkAlfredo Sumaran2016-06-291-1/+3
| | | | | | | | This fixes the double request being made to the same URL
* | Merge branch '19157-use-shortcuts-is-not-working-on-gitlab-com-help' into ↵Fatih Acet2016-06-302-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixed 'use shortcuts' button on docs ## What does this MR do? Exposes 'onToggleHelp() to window object through `showHelp()` so a help panel can be toggled globally using `showHelp()`. ## Are there points in the code the reviewer needs to double check? Is this the best implementation? I actually think this is tidier than doing something like `onclick="new Shortcuts().onToggleHelp"` or `$.trigger 'keydown', char: '?'` but let me know. ## Why was this MR needed? Docs UX ## What are the relevant issue numbers? Closes #19157. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #19157 See merge request !4979
| * | Exposed 'onToggleHelp() to window object so showHelp() can be a global function'Luke "Jared" Bennett2016-06-292-4/+4
| | | | | | | | | | | | Removed from window and used static method
* | | Merge branch 'left-align-flash-messages' into 'master' Jacob Schatz2016-06-293-2/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align flash messages with left side of page content ## What does this MR do? - align flash messages with left side of page content ## Are there points in the code the reviewer needs to double check? - flash messages in general ## Why was this MR needed? - flash messages didn't fit new design ## What are the relevant issue numbers? closes #18688 ## Screenshots # Before ![failed-login](/uploads/fb57d288fb7ae775cc0b8dbb0c7b6af2/failed-login.png) --- ![explore-blocked-account](/uploads/aa6d5ff74a4c9ed29ed361f2ffdf5c8e/explore-blocked-account.png) --- ![project-blocked-account](/uploads/4f36118f5438d661ea202b180bf9cb8d/project-blocked-account.png) --- ![issue-blocked-account](/uploads/68e87385ec30952797dc5c1f8f36216d/issue-blocked-account.png) --- ![inline-flash](/uploads/c0aba047f90d56001265e37ba9751e19/inline-flash.png) --- # After ![failed-login](/uploads/d45d2d832a16af8e1854f1832e7b87a4/failed-login.png) --- ![blocked-account](/uploads/ddcd3d23569ded403700c01934df61df/blocked-account.png) --- ![project-blocked-account](/uploads/9e286c3b95f70cae1819930a09cc1307/project-blocked-account.png) --- ![issue-blocked-account](/uploads/4fde8e770eab0dae03b25e1402f171a1/issue-blocked-account.png) --- The left padding will be fixed by !4854 ![inline-flash](/uploads/081b824b99d8ca65d67e9d15778a991d/inline-flash.png) --- ![flash-dismissed](/uploads/641e6227050de22e0df9a85ffca4ced1/flash-dismissed.png) See merge request !4959
| * | | Align flash messages with left side of page content (!4959)winniehell2016-06-293-2/+18
| | | |
* | | | Merge branch 'handle-redis-not-there' into 'master' Stan Hu2016-06-292-3/+43
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix database migrations when Redis is not running If Redis were not running or USE_DB were set to false, the application settings retrieval would fail completely. This change only attempts to use the cache if the system actually wants to connect to the DB and rescues any failures in talking to Redis. Closes #17557 See merge request !4924
| * | | Handle case when Redis cache returns an empty settingStan Hu2016-06-292-3/+10
| | | |
| * | | Fix database migrations when Redis is not runningStan Hu2016-06-292-3/+36
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | If Redis were not running or USE_DB were set to false, the application settings retrieval would fail completely. This change only attempts to use the cache if the system actually wants to connect to the DB and rescues any failures in talking to Redis. Closes #17557
* | | Merge branch 'rs-gitalb-com-staging' into 'master' Robert Speicher2016-06-292-1/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update `Gitlab.com?` to support staging Ref: https://gitlab.com/gitlab-com/operations/issues/324#note_12428337 See merge request !4637
| * | | Update `Gitlab.com?` to support stagingrs-gitalb-com-stagingRobert Speicher2016-06-272-1/+12
| | | |
* | | | Merge branch 'cache-max-user-access-name' into 'master' Robert Speicher2016-06-293-1/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize the maximum access level for the author of notes Cache the maximum access level for each user in a map in the controller In #19273, we saw that retrieving ProjectTeam#human_max_access for each note takes the bulk of the time when rendering certain issues or merge requests. We observe that most of the comments in an issue are typically done by the same users. This MR memoizes the max access level by user ID. See merge request !4982
| * | | | Be explicit which project and user ID are memoizedStan Hu2016-06-292-4/+20
| | | | |
| * | | | Memoize the maximum access level for the author of notesStan Hu2016-06-293-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #19273, we saw that retrieving ProjectTeam#human_max_access for each note takes the bulk of the time when rendering certain issues or merge requests. We observe that most of the comments in an issue are typically done by the same users. This MR memoizes the max access level by user ID.
* | | | | Merge branch 'button-focus-style' into 'master' Jacob Schatz2016-06-291-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds focus state style to markdown area buttons. ## What does this MR do? It makes it possible to see when the button is focused when tabbing through the interface. This is for the new markdown buttons in the comment field. See merge request !4867
| * | | | | Adds focus state style to markdown area buttons.button-focus-styleConnor Shea2016-06-221-1/+2
| | | | | |
* | | | | | Merge branch 'label-filter-path-fix' into 'master' Jacob Schatz2016-06-292-5/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed URL on label button when filtering ## What does this MR do? Gives the filtered labels the correct URL. Previously they tried to link to `labels#show` whereas now it links to the correct filter path. ## What are the relevant issue numbers? Closes #19005 See merge request !4897
| * | | | | | Fixed URL on label button when filteringlabel-filter-path-fixPhil Hughes2016-06-242-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19005
* | | | | | | Merge branch 'commit-avatar-alignment' into 'master' Fatih Acet2016-06-292-9/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed comit avatar alignment ## What does this MR do? Fixes the alignment of the avatar on https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG Also fixes potential issues in other places. ## Screenshots (if relevant) ![Screen_Shot_2016-06-27_at_10.58.26](/uploads/fa4f50cfc30a870422d1afa63a4331d1/Screen_Shot_2016-06-27_at_10.58.26.png)![Screen_Shot_2016-06-27_at_10.58.35](/uploads/bd7dc3cf77464c1775fabb45b8079f02/Screen_Shot_2016-06-27_at_10.58.35.png) See merge request !4933
| * | | | | | | Fixed comit avatar alignmentcommit-avatar-alignmentPhil Hughes2016-06-272-9/+4
| | | | | | | |
* | | | | | | | Merge branch '19184-turn-off-autocomplete-on-label-dropdown-for-issues-mr-s' ↵Fatih Acet2016-06-291-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Disabled native autocomplete for dropdown filter inputs ## What does this MR do? Disables native autocomplete for the dropdown filter inputs. ## Are there points in the code the reviewer needs to double check? Did we want this on all dropdown filter inputs? The issue specifies only the 'label' filter input but I think it is relevant for any filter input? ## Why was this MR needed? No need for native autocomplete. ## What are the relevant issue numbers? Closes #19184 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4974
| * | | | | | | Disabled native autocomplete for dropdown filter inputs19184-turn-off-autocomplete-on-label-dropdown-for-issues-mr-sLuke "Jared" Bennett2016-06-281-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'rubocop/enable-space-after-cops' into 'master' Robert Speicher2016-06-2922-28/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/SpaceAfterComma and Colon Rubocop cops See #17478 See merge request !4991
| * | | | | | | | Enable Style/SpaceAfterComma Rubocop coprubocop/enable-space-after-copsGrzegorz Bizon2016-06-2916-20/+20
| | | | | | | | |
| * | | | | | | | Enable Style/SpaceAfterColon Rubocop copsGrzegorz Bizon2016-06-297-8/+8
| | | | | | | | |
* | | | | | | | | Merge branch 'migration-cops' into 'master' Robert Speicher2016-06-295-1/+112
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added RuboCop cops for checking DB migrations See merge request !4906
| * | | | | | | | | Added RuboCop cops for checking DB migrationsmigration-copsYorick Peterse2016-06-295-1/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are currently two cops for this: * Migration/AddIndex: checks if indexes are added concurrently * Migration/ColumnWithDefault: checks if columns with default values are added in a concurrent manner Both cops are fairly simple and make no attempt at correcting the code as this is quite hard to do (e.g. modifications may need to be applied in various places in the same file). They however should provide enough to catch people ignoring the comments in generated migrations telling them to use add_concurrent_index or add_column_with_default.
* | | | | | | | | | Update CHANGELOG for 8.9.3Robert Speicher2016-06-291-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'issue_3359_3' into 'master' Douwe Maan2016-06-2910-37/+105
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Insert notification settings dropdown into groups ## Display notification settings dropdown for groups part of #3359 ![groups](/uploads/d61648236b81b0cca55fa2d73758f0df/groups.png) ![Screenshot_from_2016-06-29_10-58-37](/uploads/7be05ea6002932c094a81b25a308fd62/Screenshot_from_2016-06-29_10-58-37.png) ![small](/uploads/6f2b556d734c870e358f6f56618a0bab/small.png) See merge request !4857
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue_3359_3issue_3359_3Felipe Artur2016-06-29321-1907/+4728
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | merge master into issue_3359_3Felipe Artur2016-06-2910-29/+29
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Insert notification settings dropdown into groupsFelipe Artur2016-06-227-29/+102
| | | | | | | | | | | |
| * | | | | | | | | | | merge master into issue_3359_3Felipe Artur2016-06-22791-5176/+30411
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Insert notification settings dropdown into groupsFelipe Artur2016-06-227-29/+101
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'search-input-blur' into 'master' Jacob Schatz2016-06-292-10/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed search field blur not removing focus ## What does this MR do? Adds a blur event to remove focus styling from the search input. Any particular reason we were looking for clicks on the document? I can't see why we would be. ## What are the relevant issue numbers? Closes #18670 ## Screenshots (if relevant) ![tab](/uploads/4c74d4f76ec7b45bfcf581606d2defb5/tab.gif) See merge request !4704
| * | | | | | | | | | | | Fixed failing search category testssearch-input-blurPhil Hughes2016-06-201-2/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Checks for relatedTargetPhil Hughes2016-06-201-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If related target is undefined then we can't complete the below code
| * | | | | | | | | | | | Fixed issue with focusing out of dropdown not hiding menuPhil Hughes2016-06-201-0/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed search field blur not removing focusPhil Hughes2016-06-201-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18670