summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change the tier badge of Geo to be PREMIUMdocs/geo-premiumAchilleas Pipinellis2018-09-241-1/+1
|
* Merge branch 'gitaly-auth-v2' into 'master'Robert Speicher2018-09-211-8/+22
|\ | | | | | | | | Use the new gitaly auth scheme (v2) See merge request gitlab-org/gitlab-ce!21417
| * Use the new gitaly auth scheme (v2)Alejandro Rodríguez2018-09-201-8/+22
| |
* | Merge branch 'ee-admin-geo-namespace-support' into 'master'Douglas Barbosa Alexandre2018-09-211-3/+3
|\ \ | | | | | | | | | | | | Backport Admin menu changes from EE See merge request gitlab-org/gitlab-ce!21864
| * | Backport Admin menu changes from EEGabriel Mazetto2018-09-211-3/+3
| | | | | | | | | | | | | | | | | | Using path syntax to include Admin namespace as part of Project controller menu expansion code, in order to not conflict with same controller name but in Geo namespace.
* | | Merge branch '51725-push-mirrors-default-branch-reset-to-master' into 'master'Stan Hu2018-09-216-72/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Doesn't synchronize default branch for push mirrors Closes #51725 See merge request gitlab-org/gitlab-ce!21861
| * | | Add CHANGELOG entryDouglas Barbosa Alexandre2018-09-211-0/+5
| | | |
| * | | Doesn't synchronize default branch for push mirrorsDouglas Barbosa Alexandre2018-09-215-72/+0
| | | | | | | | | | | | | | | | | | | | We should not synchronize the source repository with the target root ref while updating a push mirror.
* | | | Merge branch 'align-form-labels' into 'master'Clement Ho2018-09-217-10/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Align form labels following Bootstrap 4 docs See merge request gitlab-org/gitlab-ce!21752
| * | | | Align form labels following Bootstrap 4 docsAnnabel Dunstone Gray2018-09-217-10/+14
|/ / / /
* | | | Merge branch 'docs-fix-setup-grammar-marcel-contribution-2'Robert Speicher2018-09-2154-72/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Correct grammar (setup to set-up) in Docs See merge request gitlab-org/gitlab-ce!21857
| * | | | Correct grammar (setup to set-up) in DocsMarcel Amirault2018-09-2154-72/+72
| | | | |
* | | | | Merge branch 'add-most-stars-for-filter-option' into 'master'Douglas Barbosa Alexandre2018-09-216-2/+41
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Allows to sort projects by most stars Closes #47203 See merge request gitlab-org/gitlab-ce!21762
| * | | | Allows to sort projects by most stars🙈 jacopo beschi 🙉2018-09-216-2/+41
|/ / / /
* | | | Merge branch 'docs-cycle-analytics-fix-broken-link' into 'master'Achilleas Pipinellis2018-09-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cycle Analytics - Fix broken feature page link See merge request gitlab-org/gitlab-ce!21855
| * | | | Changed feature page link to valid linkJason Colyer2018-09-211-1/+1
| | | | |
* | | | | Merge branch 'dz-issue-css-classes' into 'master'Annabel Dunstone Gray2018-09-218-21/+21
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Rename some css classes that are shared between issues and mrs See merge request gitlab-org/gitlab-ce!21856
| * | | | Rename some css classes that are shared between issues and mrsDmitriy Zaporozhets2018-09-218-21/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-09-211-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add note about projects when user is deleted See merge request gitlab-org/gitlab-ce!21843
| * | | | | Add note about projects when user is deletedBlair Lunceford2018-09-211-0/+3
|/ / / / /
* | | | | Merge branch 'fix-leading-slash-in-redirects-plus-rubocop' into 'master'Douwe Maan2018-09-216-2/+92
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix leading slash in redirects and add cop Closes #37423 and #50645 See merge request gitlab-org/gitlab-ce!21828
| * | | | Fix leading slash in redirects and add copSanad Liaquat2018-09-216-2/+92
|/ / / /
* | | | Merge branch 'fix-gitlab-capitalization-code-ce' into 'master'Douwe Maan2018-09-2122-45/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Correct Gitlab Capitalization in code files See merge request gitlab-org/gitlab-ce!21841
| * | | | Correct Gitlab Capitalization in code filesMarcel Amirault2018-09-2122-45/+45
|/ / / /
* | | | Merge branch ↵Dmitriy Zaporozhets2018-09-216-15/+56
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '47398-user-is-unable-revoke-a-authorized-application-unless-user-oauth-applications-is-checked-in-admin-settings' into 'master' Resolve "User is unable revoke a Authorized application unless User OAuth applications is checked in admin settings" Closes #47398 See merge request gitlab-org/gitlab-ce!21835
| * | | Add message about disabled oauth feature in user profileDmitriy Zaporozhets2018-09-212-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix spec message in spec/controllers/oauth/applications_controller_spec.rbDmitriy Zaporozhets2018-09-211-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Always allow user to revoke an authorized applicationDmitriy Zaporozhets2018-09-204-14/+49
| | | | | | | | | | | | | | | | | | | | | | | | Even if User OAuth applications setting is disabled in admin settings. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Update VERSION to 11.4.0-prev11.4.0.preGitLab Release Tools Bot2018-09-211-1/+1
| | | |
* | | | Update CHANGELOG.md for 11.3.0GitLab Release Tools Bot2018-09-21224-1124/+247
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'fix-chat-notification-service-for-ee' into 'master'Dmitriy Zaporozhets2018-09-213-1/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix activity titles for MRs in chat notification services Closes gitlab-ee#5325 See merge request gitlab-org/gitlab-ce!21834
| * | | | Fix activity titles for MRs in chat notification servicesNick Thomas2018-09-203-1/+23
| |/ / /
* | | | Merge branch '41040-long-webhook-url-problem' into 'master'Phil Hughes2018-09-212-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix long webhook URL overflow for custom integration Closes #41040 See merge request gitlab-org/gitlab-ce!21668
| * | | | Fix long webhook URL overflow for custom integrationKukovskii Vladimir2018-09-112-0/+6
| | | | |
* | | | | Merge branch 'docs-gitaly-shell-secret' into 'master'Achilleas Pipinellis2018-09-211-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Gitaly servers require the GitLab Shell secret See merge request gitlab-org/gitlab-ce!21847
| * | | | | Gitaly servers require the GitLab Shell secretDrew Blessing2018-09-201-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fe-modal-link-fix' into 'master'Clement Ho2018-09-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix broken link to modal component source See merge request gitlab-org/gitlab-ce!21830
| * | | | | Fix broken link to modal component sourceDennis Tang2018-09-201-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'frozen-string-app-controller' into 'master'Stan Hu2018-09-20105-9/+221
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string in app/controllers/**/*.rb See merge request gitlab-org/gitlab-ce!21736
| * | | | | Enable frozen string in app/controllers/**/*.rbrepo-forks/gitlab-ce-frozen-string-app-controllergfyoung2018-09-18105-9/+221
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following: * app/controllers/*.rb * app/controllers/admin/**/*.rb * app/controllers/boards/**/*.rb * app/controllers/ci/**/*.rb * app/controllers/concerns/**/*.rb Partially addresses #47424.
* | | | | Merge branch 'fog-iam-docs' into 'master'Stan Hu2018-09-203-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Add Fog use_iam_profile option to docs See merge request gitlab-org/gitlab-ce!21844
| * | | | Add Fog use_iam_profile option to docsDeniz Zoeteman2018-09-203-0/+3
|/ / / /
* | | | Merge branch 'tc-geo-prune-events-correctly-ce' into 'master'Nick Thomas2018-09-204-0/+97
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Gitlab::Database::Subquery.self_join to delete_all with limit See merge request gitlab-org/gitlab-ce!21839
| * | | | Add Gitlab::Database::Subquery.self_join to delete_all with limitToon Claes2018-09-204-0/+97
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `delete_all` doesn't support limit, so you'd need to subquery that. And instead of subquerying with `where(id: query)`, it's better to use an `INNER JOIN`. This method also works with MySQL, while subquerying doesn't (without another layer of subquerying) Reference: https://stackoverflow.com/questions/17892762/mysql-this-version-of-mysql-doesnt-yet-support-limit-in-all-any-some-subqu/17892886#17892886
* | | | Merge branch 'jr-wiki-doc' into 'master'Achilleas Pipinellis2018-09-201-5/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update wiki upload documentation See merge request gitlab-org/gitlab-ce!21815
| * | | | Update wiki upload documentationJames Ramsay2018-09-201-5/+8
|/ / / /
* | | | Merge branch 'jr-webhook-docs' into 'master'Achilleas Pipinellis2018-09-202-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add webhook branch filtering docs See merge request gitlab-org/gitlab-ce!21816
| * | | | Add webhook branch filtering docsJames Ramsay2018-09-202-0/+8
|/ / / /
* | | | Merge branch '51657-fix-merge-mr-from-fork-spec' into 'master'Robert Speicher2018-09-202-5/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Fix failure in merge_merge_request_from_fork_spec.rb Closes #51657 See merge request gitlab-org/gitlab-ce!21817
| * | | | QA: Fix failure in merge_merge_request_from_fork_spec.rbMark Lapierre2018-09-202-5/+21
|/ / / /
View Lorry Controller Status