summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Remove asset_sync gem and related coderemove-asset-syncBalasankar "Balu" C2018-10-251-31/+0
| | | | | Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15734 . We are not using asset sync currently.
* Remove broken git storage for testingZeger-Jan van de Weg2018-10-231-3/+0
| | | | | | | | | | | Broken storage used to be used to test situations where the Git storage wasn't being reached. These days we can just mock the Gitaly response. But given the broken storage is removed now, Gitaly can take over control of the storage being reachable. If it's not, Gitaly won't boot. That's nice for situations where a disk wasn't mounted for instance. Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/675
* Allow to configure cache path for webpackKamil Trzciński2018-10-191-1/+1
|
* Merge branch 'sh-remove-koding' into 'master'Douwe Maan2018-10-151-3/+0
|\ | | | | | | | | | | | | Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334
| * Remove Koding integration and documentationStan Hu2018-10-121-3/+0
| | | | | | | | | | | | This integration no longer works and does not appear to be supported. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697
* | Fix rubocop complaining about unicorn.rbBrett Walker2018-10-122-4/+4
|/
* Remove Git circuit breakerZeger-Jan van de Weg2018-10-102-4/+1
| | | | | | | Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
* Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-053-0/+3
|\
| * Make GitLab pages support access controlTuomo Ala-Vannesluoma2018-10-052-0/+2
| |
| * Resolve "Drop down filter for project snippets"Fabian Schneider2018-10-051-0/+1
| |
* | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-055-6/+14
|\ \ | |/
| * Merge branch 'add_reliable_fetcher' into 'master'Nick Thomas2018-10-041-3/+7
| |\ | | | | | | | | | | | | Add reliable sidekiq fetcher See merge request gitlab-org/gitlab-ce!21715
| | * Add reliable fetcher for Sidekiqadd_reliable_fetcherValery Sizov2018-10-031-3/+7
| | |
| * | Merge branch 'fix-todo-cops' into 'master'Rémy Coutable2018-10-041-1/+1
| |\ \ | | | | | | | | | | | | | | | | Fix todo cops See merge request gitlab-org/gitlab-ce!21850
| | * | Fix SpaceBeforeFirstArg copSemyon Pupkov2018-09-201-1/+1
| | | |
| * | | Merge branch '41922-simplify-runner-registration-token-resetting' into 'master'Kamil Trzciński2018-10-043-2/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify runner registration token resetting Closes #41922 See merge request gitlab-org/gitlab-ce!21658
| | * | | Simplify runner registration token resettingTomasz Maczukin2018-10-043-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This icommit adds several changes related to the same topic - resetting a Runner registration token: 1. On Project settings page it adds a button for resetting the registration token and it removes the Runner token field that was confusing all GitLab users. 2. On Group settings page it adds the same button for resetting the registration token. 3. On Admin Runners settings page it moves the button to the same place as in Project and Group settings and it changes slightly the page layout to make it more similar to Group and Project setting pages. 4. It refactorizes a little the partial that prints runner registration description. Thanks to this Project, Group and Admin settings of the Runner are re-using the same code to generate the button. 5. Updates the translations of changed text.
| * | | | Resolve "Add new "Overview" tab on user profile page"Martin Wortschack2018-10-041-0/+1
| |/ / /
* | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-044-41/+22
|\ \ \ \ | |/ / /
| * | | Merge branch '43511-upgrade-to-babel-7' into 'master'Fatih Acet2018-10-032-1/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to Babel 7 Closes #43511 See merge request gitlab-org/gitlab-ce!22059
| | * | | Make DefinePlugin definitions more specificMike Greiling2018-10-021-3/+2
| | | | |
| | * | | Remove babel-plugin-transform-define dependencyMike Greiling2018-10-021-4/+7
| | | | |
| | * | | Merge remote-tracking branch 'origin/psimyn-speedup-karma' into ↵Mike Greiling2018-10-021-1/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43511-upgrade-to-babel-7 * origin/psimyn-speedup-karma: Fix lint and comments Speed up karma runs for development
| | | * | | Speed up karma runs for developmentSimon Knox2018-10-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using DefinePlugin means the block wrapped in GENERATE_COVERAGE_REPORT gets eliminated. Previously it was always included (with the entire app!), even if using -f option
| | * | | | Add license approval for caniuse-lite and node-releasesMike Greiling2018-10-021-0/+14
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are needed for babel-preset-env to function. These are both curated lists of compatability tables which are used during the build process to determine which babel transformations to perform.
| * | | | Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-022-40/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup code, and refactor tests that still use Rugged. After this, there should be no Rugged code that access the instance's repositories on non-test environments. There is still some rugged code for other tasks like the repository import task, but since it doesn't access any repository storage path it can stay.
* | | | Add unschedule endpont to job controllerShinya Maeda2018-10-021-0/+1
|/ / /
* | | Merge branch 'dz-fix-mysql-schema' into 'master'Dmitriy Zaporozhets2018-10-011-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Fix undefined format_options method in SchemaDumper for MySQL db See merge request gitlab-org/gitlab-ce!21907
| * | | Fix undefined format_options method in SchemaDumper for MySQL dbdz-fix-mysql-schemaDmitriy Zaporozhets2018-09-261-0/+4
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Guard against a login attempt with invalid CSRF tokensh-guard-against-ldap-login-csrf-failStan Hu2018-09-261-0/+5
| |/ |/| | | | | | | | | | | | | If a user logs in with a bad CSRF token, the Warden before_logout hook will be called with no valid user. This would lead to odd Error 500 messages with a backtrace. Addresses part of #50857
* | Remove background job throttling feature51509-remove-sidekiq-limit-fetchValery Sizov2018-09-241-2/+0
| | | | | | | | We remove this feature as it never worked properly
* | Fix leading slash in redirects and add copSanad Liaquat2018-09-212-2/+2
| |
* | Correct Gitlab Capitalization in code filesMarcel Amirault2018-09-211-1/+1
|/
* Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-201-0/+1
|\ | | | | | | | | | | | | Resolve "Split admin settings into multiple sub pages" Closes #44998 See merge request gitlab-org/gitlab-ce!21467
| * merge master and resolve conflictsMartin Wortschack2018-09-115-20/+63
| |\
| * \ merge master and resolve conflictsMartin Wortschack2018-09-0610-33/+124
| |\ \
| * | | adds 'Geo' sub page to application settingsMartin Wortschack2018-09-051-1/+1
| | | |
| * | | split application settings into multiple sub pagesMartin Wortschack2018-09-041-0/+1
| | | |
* | | | Merge branch '44768-lazy-load-xterm-css' into 'master'Phil Hughes2018-09-201-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy load xterm css custom colors file Closes #44768 See merge request gitlab-org/gitlab-ce!21804
| * | | | Lazy load xterm css colorsFilipa Lacerda2018-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually includes the xterm custom colors on the 3 files that will need it: job log page, job terminal page, environment terminal page Reduces main CSS bundle
* | | | | Include post migrations when loading the schemaYorick Peterse2018-09-191-11/+1
|\ \ \ \ \ | |/ / / / |/| | | | See merge request gitlab-org/gitlab-ce!21689
| * | | | Ensure the schema is loaded with post_migrations includedDJ Mountney2018-09-111-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If doing a schema load, the post_migrations should also be marked as up, even if SKIP_POST_DEPLOYMENT_MIGRATIONS was set, otherwise future migration runs will be broken.
* | | | | Fix grammar (setup to set-up) in code comments, spec, views, etc.Marcel Amirault2018-09-172-3/+3
| | | | |
* | | | | Merge branch '50824-fix-prepend-concern' into 'master'Robert Speicher2018-09-141-20/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE: Properly implement prepending for Concern See merge request gitlab-org/gitlab-ce!21444
| * | | | | Properly implement prepending for ConcernLin Jen-Shin2018-09-111-20/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'remove-sidekiq' into 'master'Robert Speicher2018-09-141-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove peek-sidekiq Closes #51407 See merge request gitlab-org/gitlab-ce!21693
| * | | | | Remove peek-sidekiqJan Provaznik2018-09-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for removing this gem is that it's not being maintained anymore. It uses `alias_method_chain` which is deprecated in rails 5 (and removed in 5.1), the issue is pending upstream (including a fix) - https://github.com/suranyami/peek-sidekiq/issues/3 for a while. Peek-sidekiq is used in performance bar for displaying sidekiq statistics.
* | | | | | Fix karma junit reports on CILukas Eipert2018-09-141-1/+1
| | | | | |
* | | | | | Merge branch '49990-enable-omniauth-by-default' into 'master'Douwe Maan2018-09-132-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable omniauth by default Closes #49990 See merge request gitlab-org/gitlab-ce!21700
| * | | | | | Enable omniauth by defaultNick Thomas2018-09-132-3/+3
| |/ / / / /