summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'webpack-auto-config' into 'master'Jacob Schatz2018-02-021-0/+23
|\ | | | | | | | | Automatically Generate Webpack Entry Points See merge request gitlab-org/gitlab-ce!16865
| * prevent dynamic chunks from being duplicated by the dispatcher until it is ↵Mike Greiling2018-02-011-2/+13
| | | | | | | | completely refactored
| * generate webpack entry points for pages directory automaticallyMike Greiling2018-02-011-0/+12
| |
* | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-012-2/+19
|/
* Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-016-17/+17
|
* Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-311-0/+2
|\ | | | | | | | | Gitaly Server info for admin panel See merge request gitlab-org/gitlab-ce!16794
| * Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Implements the client side for gitlab-org/gitaly#819. Which is a server info command. This checks the server version and git binairy version on the server. A small UI was added for administrators, so they can check the status of the Gitaly server. This is done for each storage the monolith knows. Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That MR removed the Git version too, but didn't replace it with anything.
* | Don't assume postgresql in two initializersNick Thomas2018-01-302-44/+48
|/
* Merge branch 'grape-router-helpers-bugfix' into 'master'Rémy Coutable2018-01-301-0/+16
|\ | | | | | | | | Fix grape-route-helper route shadowing See merge request gitlab-org/gitlab-ce!16781
| * Fix grape-route-helper route shadowinggrape-router-helpers-bugfixMario de la Ossa2018-01-291-0/+16
| | | | | | | | | | Bringing in https://github.com/reprah/grape-route-helpers/pull/21 as a monkey patch since the grape-route-helpers project seems to be abandoned
* | Eliminate the last warning for redis wrapperLin Jen-Shin2018-01-261-0/+1
|/
* Merge branch ↵Grzegorz Bizon2018-01-266-13/+29
|\ | | | | | | | | | | | | | | | | '42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico' into 'master' Port some non-EE-specific config/ changes to CE Closes #42420 See merge request gitlab-org/gitlab-ce!16710
| * Port some non-EE-specific config/ changes to CE42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-icoRémy Coutable2018-01-256-13/+29
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-251-28/+0
|\ \ | | | | | | | | | | | | Add a lint check to restrict use of Rugged See merge request gitlab-org/gitlab-ce!16656
| * | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-251-28/+0
| |/
* | Merge branch '40028-special-characters-on-issuable-templates' into 'master'Rémy Coutable2018-01-251-1/+1
|\ \ | |/ |/| | | | | | | | | Handling special characters in Issuable Templates Closes #40028 See merge request gitlab-org/gitlab-ce!15323
| * Handle special characters on API request of issuable templatesTakuya Noguchi2018-01-251-1/+1
| |
* | Merge branch 'default-to-https-for-gravatar-urls' into 'master'Rémy Coutable2018-01-252-4/+6
|\ \ | | | | | | | | | | | | Default to HTTPS for all Gravatar URLs See merge request gitlab-org/gitlab-ce!16666
| * | Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urlsAchilleas Pipinellis2018-01-252-4/+6
| |/ | | | | | | | | If using gravatar.com, both plain_url and ssl_url in settings are now served via HTTPS. Make this the default.
* | Merge branch 'jej/gitattributes-check-at-ref' into 'master'Rémy Coutable2018-01-251-2/+2
|\ \ | |/ |/| | | | | Can parse root .gitattributes file for a ref See merge request gitlab-org/gitlab-ce!16418
| * Can parse root .gitattributes file for a refjej/gitattributes-check-at-refJames Edwards-Jones2018-01-241-2/+2
| |
* | Merge branch 'groups-webpack-bundle' into 'master'Filipa Lacerda2018-01-241-3/+0
|\ \ | | | | | | | | | | | | Added dispatcher imports for groups webpack bundle See merge request gitlab-org/gitlab-ce!16644
| * | Added dispatcher imports for groups webpack bundlePhil Hughes2018-01-231-5/+2
| | |
* | | correctly imports performance barPhil Hughes2018-01-241-3/+2
| | |
* | | Merge branch '42251-explicit-timezone-for-karma' into 'master'Mike Greiling2018-01-231-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Set timezone for karma CI job to Etc/UTC (UTC+0) Closes #42251 See merge request gitlab-org/gitlab-ce!16602
| * | | Set timezone for karma to UTCTakuya Noguchi2018-01-231-0/+2
| |/ /
* | | Prevent Unicorn crashing in development on macOSJacob Vosmaer (GitLab)2018-01-231-0/+13
|/ /
* | WebIDE: Fix Commit bugsTim Zallmann2018-01-191-1/+6
| |
* | Upgraded Karma DependenciesTim Zallmann2018-01-181-0/+13
| |
* | Merge branch 'dispatcher-projects' into 'master'Filipa Lacerda2018-01-181-1/+0
|\ \ | | | | | | | | | | | | Added dispatcher imports for some project routes See merge request gitlab-org/gitlab-ce!16389
| * | Added dispatcher imports for some project routesPhil Hughes2018-01-161-1/+0
| | |
* | | Update seed-fu to a version compatible with postgresql 10Nick Thomas2018-01-161-0/+9
| | |
* | | Support PostgreSQL 10Nick Thomas2018-01-161-0/+48
|/ /
* | Log and send a system hook if a blocked user fails to loginsh-log-when-user-blockedStan Hu2018-01-141-0/+4
| | | | | | | | Closes #41633
* | Display related merge requests in commit detail pageHiroyuki Sato2018-01-121-0/+1
| |
* | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-114-0/+6
| |
* | Filter out build traces from logged parametersStan Hu2018-01-111-0/+2
|/
* Fixing bug related to wiki last versionFrancisco Javier López2018-01-091-0/+20
|
* Merge branch 'winh-webpack-concatenated-module' into 'master'Jacob Schatz2018-01-081-5/+25
|\ | | | | | | | | | | | | Fix Webpack config for ConcatenatedModule Closes #41649 See merge request gitlab-org/gitlab-ce!16219
| * Fix Webpack config for ConcatenatedModulewinh-webpack-concatenated-moduleWinnie Hellmann2018-01-041-5/+25
| |
* | Change reset_cache action from get to postMatija Čupić2018-01-051-1/+1
| |
* | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-051-0/+1
|\ \
| * | Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-043-4/+9
|\ \ | |/
| * Merge branch ↵Sean McGivern2018-01-021-0/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | '39289-local-schema-rb-automatically-reverts-datetime-to-datetime_with_timezone-after-migrations' into 'master' Prevent schema.rb reverting from datetime_with_timezone to datetime Closes #39289 See merge request gitlab-org/gitlab-ce!14956
| | * Prevent schema.rb reverting from datetime_with_timezone to datetime39289-local-schema-rb-automatically-reverts-datetime-to-datetime_with_timezone-after-migrationsJames Edwards-Jones2017-12-071-0/+5
| | |
| * | Rename asset sync related AWS variableschange-asset-sync-env-variablesBalasankar "Balu" C2018-01-011-2/+2
| | |
| * | Add pause/resume button to specific project runnersMario de la Ossa2017-12-271-2/+2
| | |
* | | Move cache reset to ci_cd_settings controllerMatija Čupić2018-01-041-2/+3
| | |
* | | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2017-12-224-9/+22
|\ \ \ | |/ /
View Lorry Controller Status