summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make GH one-off auth the default again for importing GH projectsRémy Coutable2016-06-306-21/+30
| | | | | | Advertise the PAT as an alternative unless GH import is not configured. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Import from Github using Personal Access Tokens.Eric K Idema2016-06-3012-54/+167
| | | | | | | | | | | | | This stands as an alternative to using OAuth to access a user's Github repositories. This is setup in such a way that it can be used without OAuth configuration. From a UI perspective, the how to import modal has been replaced by a full page, which includes a form for posting a personal access token back to the Import::GithubController. If the user has logged in via GitHub, skip the Personal Access Token and go directly to Github for an access token via OAuth.
* Merge branch 'sidebar-breakpoint' into 'master' Jacob Schatz2016-06-302-2/+2
|\ | | | | | | | | | | | | | | | | | | | | Updated breakpoint for sidebar pinning ## What does this MR do? Updates the breakpoint for sidebar pinning to 1024px. Think we will have the same issue as before when picking into stable with `$window` not being defined. See merge request !5019
| * Updated breakpoint for sidebar pinningPhil Hughes2016-06-302-2/+2
| |
* | Merge branch '18709-branch-tag-collection-caching' into 'master' Yorick Peterse2016-06-305-14/+78
|\ \ | | | | | | | | | | | | Project dashboard appears to be loading tags on every request See merge request !4996
| * | Expire branch/tag git data when needed.18709-branch-tag-collection-cachingPaco Guzman2016-06-305-14/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When pushing commits to existing branches we don’t need to flush branch git data (branch names / counts) When flushes the cache when pushing commits skip to flush branch and tag git data (names / counts) because those operations are managed explicitly in each case Repopulated expired cache as soon as possible
* | | Merge branch 'rack-request-trusted-proxies' into 'master' Douwe Maan2016-06-303-4/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Rack::Request use our trusted proxies when filtering IP addresses ## What does this MR do? This allows us to control the trusted proxies while deployed in a private network. ## Are there points in the code the reviewer needs to double check? If we want to limit what is impacted, we can do this specifically for the rack_attack request object. ## Why was this MR needed? Normally Rack::Request will trust all private IPs as trusted proxies, which can cause problems if your users are connection on you network via private IP ranges. Normally in a rails app this is handled by action_dispatch request, but rack_attack is specifically using the Rack::Request object instead. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17550 ## Does this MR meet the acceptance criteria? - [x] [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 - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) \cc @stanhu See merge request !4958
| * | | Make Rack::Request use our trusted proxies when filtering IP addressesrack-request-trusted-proxiesDJ Mountney2016-06-293-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | This allows us to control the trusted proxies while deployed in a private network. Normally Rack::Request will trust all private IPs as trusted proxies, which can caue problems if your users are connection on you network via private IP ranges. Normally in a rails app this is handled by action_dispatch request, but rack_attack is specifically using the Rack::Request object instead.
* | | | Merge branch 'code_style_fixes' into 'master' Robert Speicher2016-06-3041-45/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary parens and other code style fixes This MR is based on reviewers` comments to https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/440 See merge request !5015
| * | | | Remove unnecessary parenscode_style_fixesValery Sizov2016-06-3041-45/+44
| | | | |
* | | | | Merge branch 'rubocop/enable-unneeded-capital-w-cop' into 'master' Robert Speicher2016-06-303-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/UnneededCapitalW Rubocop cop ## What does this MR do? This MR enables Rubocop cop that checks if `%W[]`, which supports interpolation, is needed. ## What are the relevant issue numbers? #17478 See merge request !5010
| * | | | Enable Style/UnneededCapitalW Rubocop coprubocop/enable-unneeded-capital-w-copGrzegorz Bizon2016-06-303-5/+5
| | | | |
* | | | | Merge branch 'pin-nav-cookie-expiry' into 'master' Jacob Schatz2016-06-301-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expiry date on pinned nav cookie ## What does this MR do? Adds an expiry date far into the future for the pinned nav cookie so that it survives logout & browser closing. See merge request !5009
| * | | | Expiry date on pinned nav cookiepin-nav-cookie-expiryPhil Hughes2016-06-301-2/+2
| |/ / /
* | | | Merge branch 'global-ajax-error-handler' into 'master' Dmitriy Zaporozhets2016-06-302-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global Ajax error handler ## What does this MR do? Introduces a new global Ajax error handler to show a flash warning about the error detail of XHR requests which failed with status code 404 and 500 ## Are there points in the code the reviewer needs to double check? Double check the wording. ## Why was this MR needed? A global solution for the problem in the #17880 ## What are the relevant issue numbers? Fixes #17880 ## Screenshots (if relevant) For requests failed with 404 - 500 ![Screen_Shot_2016-06-21_at_00.07.26](/uploads/04bb3a5a958c3d21aef4fd12bd3d105a/Screen_Shot_2016-06-21_at_00.07.26.png) For requests failed with 401 ![Screen_Shot_2016-06-21_at_00.08.30](/uploads/25cc885ba388f4c6f4c555fa338e1a63/Screen_Shot_2016-06-21_at_00.08.30.png) See merge request !4797
| * | | | Added global ajax error handler to show a flash notification for failed ↵global-ajax-error-handlerFatih Acet2016-06-212-0/+10
| | | | | | | | | | | | | | | | | | | | requests.
* | | | | Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-306-6/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loop all disks when displaying system info. Closes #18886 See merge request !4983
| * | | | | Loop all disks when displaying system infoissue-18886Josh Frye2016-06-296-6/+38
| | | | | |
* | | | | | Merge branch 'remove-converalls-gem' into 'master' Dmitriy Zaporozhets2016-06-303-14/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove coveralls as its unused This gem is unused so could be removed. @dzaporozhets @connorshea We've discussed this some time ago on Slack See merge request !5001
| * | | | | Remove coveralls as its unusedremove-converalls-gemZ.J. van de Weg2016-06-303-14/+1
| | | | | |
* | | | | | Merge branch 'shards' into 'master' Yorick Peterse2016-06-3057-413/+779
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Implement multiple repository mount points See merge request !4578
| * | | | | Merge branch 'shards-config' into 'shards' Yorick Peterse2016-06-3013-3/+70
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Application Setting to configure default Repository Path for new projects See merge request !4657
| | * | | | | Add Application Setting to configure default Repository Path for new projectsshards-configAlejandro Rodríguez2016-06-2913-3/+70
| |/ / / / /
| * | | | | Create (if necessary) and link the gitlab-shell secret file on the rake ↵shardsAlejandro Rodríguez2016-06-294-19/+43
| | | | | | | | | | | | | | | | | | | | | | | | install task
| * | | | | Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-2947-391/+666
| | |_|_|/ | |/| | |
* | | | | 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
View Lorry Controller Status