summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix wording around NGINX Shibboleth setupmrchrisw/docs/shibbolethChris Wilson2016-07-011-1/+1
|
* Merge branch 'improve-system-info' into 'master' Stan Hu2016-07-011-11/+38
|\ | | | | | | | | | | | | Catch permission denied errors and ignore the disk See merge request !5017
| * Catch permission denied errors and ignore the diskimprove-system-infoJosh Frye2016-06-301-11/+38
| |
* | Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9.Robert Speicher2016-06-301-4/+21
| | | | | | | | [ci skip]
* | Merge branch 'as-fix-changelog-entries' into 'master' Robert Speicher2016-06-301-3/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove duplicated entries from CHANGELOG [ci skip] See merge request !5028
| * | Remove additional entries from CHANGELOGAlfredo Sumaran2016-06-301-3/+0
| | |
* | | Merge branch 'build-reopen-json' into 'master' Gabriel Mazetto2016-06-301-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build path sends JSON file path ## What does this MR do? Fixes an issue with browser caching JSON response on build page. Steps to see: - Open build (https://gitlab.com/gitlab-org/gitlab-ce/builds/2030226) - Close tab - Re-open tab You should now see some JSON :disappointed: This MR appends `.json` to the end of the build URL so that the browser can't cache it as the same URL. See merge request !4935
| * | Build path sends JSON file pathbuild-reopen-jsonPhil Hughes2016-06-281-1/+1
| | |
* | | Merge branch 'cleanup-forgotten-lines' into 'master' Robert Speicher2016-06-302-10/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cleanup forgotten lines The `coveralls` gem was unused and thus removed in 7a2f25a. I've forgotten some lines in that MR See merge request !5025
| * | | Remove coveralls linescleanup-forgotten-linesZ.J. van de Weg2016-06-302-10/+0
| | | |
* | | | Merge branch 'fix/build-retry-button-in-view' into 'master' Robert Speicher2016-06-304-1/+57
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show build retry link when build is active Closes #19244 See merge request !4967
| * | | | 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 ↵Yorick Peterse2016-06-301-2/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | '18991-update-test-env-gitlab-shell-version-when-v3-1-0-is-published' into 'master' Remove hardcoded gitlab-shell version in test env now that the required tag is published See merge request !5023
| * | | | Remove hardcoded gitlab-shell version in test env now that the required tag ↵Alejandro Rodríguez2016-06-301-2/+1
| | | | | | | | | | | | | | | | | | | | is published
* | | | | Merge branch 'fix-external-issue-rendering' into 'master' Robert Speicher2016-06-305-6/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle external issues in IssueReferenceFilter Rendering issue references such as `#1` was broken for projects using an external issues tracker. See gitlab-org/gitlab-ce#19036 See merge request !4988
| * | | | | Fix broken spec in git_push_service_spec by stubbing an external issue trackerfix-external-issue-renderingStan Hu2016-06-301-0/+2
| | | | | |
| * | | | | Handle external issues in IssueReferenceFilterYorick Peterse2016-06-304-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssueReferenceFilter will end up processing internal issue references when a project uses an external issues tracker while still using internal issue references (in the form of `#\d+`). This commit ensures that these links are rendered as external issue links, regardless of whether the project one currently views uses an internal or external issues tracker. Fixes gitlab-org/gitlab-ce#19036, gitlab-com/performance#16
* | | | | | Merge branch 'ericidema/gitlab-ce-import-with-github-personal-access-tokens' ↵Douwe Maan2016-06-3013-54/+176
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Allow importing from Github using Personal Access Tokens _Originally opened at !4005 by @ericidema._ ------ ## What does this MR do? * Made changes to `Gitlab::GithubImport::Client` so that it can be used with Github Personal Access Tokens without the need for OAuth. * Added UI to collect Personal Access Token from user. * Detect if the user has logged in with GitHub and use OAuth to skip the Personal Access Token form. ## Are there points in the code the reviewer needs to double check? Twin Omnibus MR: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/774 ## What are the relevant issue numbers? Closes #13970. ## Screenshots ### GitHub import is configured ![github_import_configured](/uploads/151e4f0edf3f87bfa03c2d97dda8b3d8/github_import_configured.png) ----- ### GitHub import is not configured ![github_import_not_configured](/uploads/cb129f7e2ffe66cceb28ccd9af480284/github_import_not_configured.png) ----- ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] 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 !4938
| * | | | | 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 'fix-changelog' into 'master' Rémy Coutable2016-06-301-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong line in changelog ## What does this MR do? Fix a wrong line in the changelog See merge request !5008
| * | | | | | Fix wrong line in changelogRobert Schilling2016-06-301-1/+0
| | | | | | |
* | | | | | | Merge branch 'fix_restore_warning' into 'master' Rémy Coutable2016-06-302-1/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix restore warning message ## What does this MR do? Fix the restore Rake task so it properly outputs the database warning. This is a pretty important warning and it was not even being output. After this fix, the output looks like the screenshot below. ![Screen_Shot_2016-06-28_at_3.53.46_PM](/uploads/d250189d39fcacd0c8ec0aacf9cd930d/Screen_Shot_2016-06-28_at_3.53.46_PM.png) See merge request !4980
| * | | | | | Fix restore warning messageDrew Blessing2016-06-282-1/+3
| | | | | | |
* | | | | | | 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
| | |_|_|/ / / | |/| | | | |