Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix grape-route-helper route shadowinggrape-router-helpers-bugfix | Mario de la Ossa | 2018-01-29 | 1 | -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 | ||||
* | Merge branch ↵ | Grzegorz Bizon | 2018-01-26 | 6 | -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-ico | Rémy Coutable | 2018-01-25 | 6 | -13/+29 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'lint-rugged' into 'master' | Rémy Coutable | 2018-01-25 | 1 | -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-rugged | Jacob Vosmaer | 2018-01-25 | 1 | -28/+0 |
| |/ | |||||
* | | Merge branch '40028-special-characters-on-issuable-templates' into 'master' | Rémy Coutable | 2018-01-25 | 1 | -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 templates | Takuya Noguchi | 2018-01-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'default-to-https-for-gravatar-urls' into 'master' | Rémy Coutable | 2018-01-25 | 2 | -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-urls | Achilleas Pipinellis | 2018-01-25 | 2 | -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 Coutable | 2018-01-25 | 1 | -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-ref | James Edwards-Jones | 2018-01-24 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'groups-webpack-bundle' into 'master' | Filipa Lacerda | 2018-01-24 | 1 | -3/+0 |
|\ \ | | | | | | | | | | | | | Added dispatcher imports for groups webpack bundle See merge request gitlab-org/gitlab-ce!16644 | ||||
| * | | Added dispatcher imports for groups webpack bundle | Phil Hughes | 2018-01-23 | 1 | -5/+2 |
| | | | |||||
* | | | correctly imports performance bar | Phil Hughes | 2018-01-24 | 1 | -3/+2 |
| | | | |||||
* | | | Merge branch '42251-explicit-timezone-for-karma' into 'master' | Mike Greiling | 2018-01-23 | 1 | -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 UTC | Takuya Noguchi | 2018-01-23 | 1 | -0/+2 |
| |/ / | |||||
* | | | Prevent Unicorn crashing in development on macOS | Jacob Vosmaer (GitLab) | 2018-01-23 | 1 | -0/+13 |
|/ / | |||||
* | | WebIDE: Fix Commit bugs | Tim Zallmann | 2018-01-19 | 1 | -1/+6 |
| | | |||||
* | | Upgraded Karma Dependencies | Tim Zallmann | 2018-01-18 | 1 | -0/+13 |
| | | |||||
* | | Merge branch 'dispatcher-projects' into 'master' | Filipa Lacerda | 2018-01-18 | 1 | -1/+0 |
|\ \ | | | | | | | | | | | | | Added dispatcher imports for some project routes See merge request gitlab-org/gitlab-ce!16389 | ||||
| * | | Added dispatcher imports for some project routes | Phil Hughes | 2018-01-16 | 1 | -1/+0 |
| | | | |||||
* | | | Update seed-fu to a version compatible with postgresql 10 | Nick Thomas | 2018-01-16 | 1 | -0/+9 |
| | | | |||||
* | | | Support PostgreSQL 10 | Nick Thomas | 2018-01-16 | 1 | -0/+48 |
|/ / | |||||
* | | Log and send a system hook if a blocked user fails to loginsh-log-when-user-blocked | Stan Hu | 2018-01-14 | 1 | -0/+4 |
| | | | | | | | | Closes #41633 | ||||
* | | Display related merge requests in commit detail page | Hiroyuki Sato | 2018-01-12 | 1 | -0/+1 |
| | | |||||
* | | Adds Rubocop rule for line break around conditionals | 🙈 jacopo beschi 🙉 | 2018-01-11 | 4 | -0/+6 |
| | | |||||
* | | Filter out build traces from logged parameters | Stan Hu | 2018-01-11 | 1 | -0/+2 |
|/ | |||||
* | Fixing bug related to wiki last version | Francisco Javier López | 2018-01-09 | 1 | -0/+20 |
| | |||||
* | Merge branch 'winh-webpack-concatenated-module' into 'master' | Jacob Schatz | 2018-01-08 | 1 | -5/+25 |
|\ | | | | | | | | | | | | | Fix Webpack config for ConcatenatedModule Closes #41649 See merge request gitlab-org/gitlab-ce!16219 | ||||
| * | Fix Webpack config for ConcatenatedModulewinh-webpack-concatenated-module | Winnie Hellmann | 2018-01-04 | 1 | -5/+25 |
| | | |||||
* | | Change reset_cache action from get to post | Matija Čupić | 2018-01-05 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into 41249-clearing-the-cache | Matija Čupić | 2018-01-05 | 1 | -0/+1 |
|\ \ | |||||
| * | | Backport 'Rebase' feature from EE to CEjprovazn-rebase | Jan Provaznik | 2018-01-05 | 1 | -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-cache | Matija Čupić | 2018-01-04 | 3 | -4/+9 |
|\ \ | |/ | |||||
| * | Merge branch ↵ | Sean McGivern | 2018-01-02 | 1 | -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-migrations | James Edwards-Jones | 2017-12-07 | 1 | -0/+5 |
| | | | |||||
| * | | Rename asset sync related AWS variableschange-asset-sync-env-variables | Balasankar "Balu" C | 2018-01-01 | 1 | -2/+2 |
| | | | |||||
| * | | Add pause/resume button to specific project runners | Mario de la Ossa | 2017-12-27 | 1 | -2/+2 |
| | | | |||||
* | | | Move cache reset to ci_cd_settings controller | Matija Čupić | 2018-01-04 | 1 | -2/+3 |
| | | | |||||
* | | | Merge branch 'master' into 41249-clearing-the-cache | Matija Čupić | 2017-12-22 | 4 | -9/+22 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'dm-issue-move-transaction-error' into 'master' | Robert Speicher | 2017-12-22 | 1 | -3/+5 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Execute project hooks and services after commit when moving an issue Closes #41324 See merge request gitlab-org/gitlab-ce!16108 | ||||
| | * | | Execute project hooks and services after commit when moving an issuedm-issue-move-transaction-error | Douwe Maan | 2017-12-22 | 1 | -3/+5 |
| | | | | |||||
| * | | | Use gitlab-styles | Rémy Coutable | 2017-12-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Make webpack fail for missing exports | Winnie Hellmann | 2017-12-22 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'diff-worker-js-fix' into 'master' | Jacob Schatz | 2017-12-21 | 1 | -1/+4 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed diff_worker not compiling correctly Closes #41182 See merge request gitlab-org/gitlab-ce!15966 | ||||
| | * | | | changed webpack configdiff-worker-js-fix | Phil Hughes | 2017-12-16 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Merge branch 'master' into fix-webpack-chunk-naming | Clement Ho | 2017-12-21 | 2 | -3/+8 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Resolve "Decouple multi-file editor from file list" | Tim Zallmann | 2017-12-21 | 2 | -2/+4 |
| | | | | | |||||
| * | | | | properly handle naming for dispatcher route chunks | Mike Greiling | 2017-12-20 | 1 | -2/+7 |
| | | | | | |||||
* | | | | | Stub out project#reset_cache | Matija Čupić | 2017-12-21 | 1 | -0/+1 |
| |/ / / |/| | | |