summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / / /
* | | | Merge branch 'move-cloud-images-job-stage' into 'master'Robert Speicher2018-09-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move the cloud-native-image trigger job into the test stage See merge request gitlab-org/gitlab-ce!21819
| * | | | Move the cloud-native-image trigger job into the test stageDJ Mountney2018-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because the CNG pipeline now relies on the assets compiled here in the gitlab:assets:compile job (It waits up to 30 minutes for them) Without this change, the cloud native job was holding up the pipeline, preventing the assets compile job from being run.
* | | | | Merge branch '51549-runners-table' into 'master'Annabel Dunstone Gray2018-09-205-50/+77
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Admin Runners table not wrapping the content Closes #51549 See merge request gitlab-org/gitlab-ce!21802
| * | | | | Wrap content for admin runners tableFilipa Lacerda2018-09-205-50/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While refactoring the table into a responsive one we did not account for wrapping issues. This commit wraps some cells and truncates others. Adds `section-5` class to the responsive tables CSS
* | | | | | Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-2021-537/+704
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Split admin settings into multiple sub pages" Closes #44998 See merge request gitlab-org/gitlab-ce!21467
| * | | | | | Utilize expanded_by_defaultMartin Wortschack2018-09-199-75/+71
| | | | | | |
| * | | | | | Add empty controller actions and utilize referer_path helperMartin Wortschack2018-09-192-2/+30
| | | | | | |
| * | | | | | Groups test cases by contextMartin Wortschack2018-09-181-278/+266
| | | | | | |
| * | | | | | Parse request.referer properlyMartin Wortschack2018-09-181-1/+1
| | | | | | |
| * | | | | | Rename helper methodMartin Wortschack2018-09-182-4/+4
| | | | | | |
| * | | | | | Adds translationsMartin Wortschack2018-09-188-16/+16
| | | | | | |
| * | | | | | Adds 'Snowplow' section to IntegrationsMartin Wortschack2018-09-141-0/+2
| | | | | | |
| * | | | | | Moves 'External Authorization' before 'Web terminal'Martin Wortschack2018-09-141-0/+2
| | | | | | |
| * | | | | | Removes duplicated sectionsMartin Wortschack2018-09-142-22/+0
| | | | | | |
| * | | | | | Adds empty methods for 'geo' and 'templates'Martin Wortschack2018-09-141-0/+6
| | | | | | |
| * | | | | | Removes divider in flyout menuMartin Wortschack2018-09-131-9/+1
| | | | | | |
| * | | | | | remove 'Geo' and 'Templates' template from CE and display menu items for EE onlyMartin Wortschack2018-09-114-25/+21
| | | | | | |
| * | | | | | load usage ping script on admin settings subpage onlyMartin Wortschack2018-09-112-5/+8
| | | | | | |
| * | | | | | merge master and resolve conflictsMartin Wortschack2018-09-11765-6663/+11476
| |\ \ \ \ \ \
| * | | | | | | use referer for redirect instead of hidden field param from partialsMartin Wortschack2018-09-1031-61/+1
| | | | | | | |
| * | | | | | | fix test for usage statisticsMartin Wortschack2018-09-071-0/+2
| | | | | | | |
| * | | | | | | fix broken pathMartin Wortschack2018-09-071-1/+1
| | | | | | | |
| * | | | | | | merge master and resolve conflictsMartin Wortschack2018-09-06543-4985/+97825
| |\ \ \ \ \ \ \
| * | | | | | | | add breadcrumb and page title for sub pages on admin settingsMartin Wortschack2018-09-069-18/+18
| | | | | | | | |
View Lorry Controller Status