delta/gitlab/gitlab-ce.git/scripts, branch background-migration-fix gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'revert-c8ddf067' into 'master' 2018-01-17T13:31:16+00:00 Tim Zallmann tzallmann@gitlab.com 2018-01-17T13:31:16+00:00 d7eb36921853d399076d18be8e5d4e4252d43cfa Revert "Merge branch 'pre-commit-prettier' into 'master'" See merge request gitlab-org/gitlab-ce!16217 
Revert "Merge branch 'pre-commit-prettier' into 'master'"

See merge request gitlab-org/gitlab-ce!16217
 Merge remote-tracking branch 'upstream/master' into 1819-override-ce 2018-01-12T11:43:38+00:00 Lin Jen-Shin godfat@godfat.org 2018-01-12T11:43:38+00:00 cfd75101d19db3235b64b05d7a58616db40f22c6 * upstream/master: (621 commits) Add a note about GitLab QA page objects validator to docs Refactor dispatcher projects blame and blob path Update export message to mention we can download the file from the UI Fix Ctrl+Enter keyboard shortcut saving comment/note edit fix case where tooltip messes up :last-child selector Add reason to keep postgresql 9.2 for CI Remove warning noise in ProjectImportOptions Add changelog entry Add RedirectRoute factory Update Ingress extra cost note to be more generic Fix Rubocop offense Refactor dispatcher project branches path Revert "Revert "Fix Route validation for unchanged path"" Document that we need rsync for backing up Docs: move article "Laravel and Envoy w/ CI/CD" Recommend against the use of EFS Adds Rubocop rule for line break around conditionals Update CHANGELOG.md for 10.1.6 Filter out build traces from logged parameters Refactored project:n* imports in dispatcher.js ... 
* upstream/master: (621 commits)
  Add a note about GitLab QA page objects validator to docs
  Refactor dispatcher projects blame and blob path
  Update export message to mention we can download the file from the UI
  Fix Ctrl+Enter keyboard shortcut saving comment/note edit
  fix case where tooltip messes up :last-child selector
  Add reason to keep postgresql 9.2 for CI
  Remove warning noise in ProjectImportOptions
  Add changelog entry
  Add RedirectRoute factory
  Update Ingress extra cost note to be more generic
  Fix Rubocop offense
  Refactor dispatcher project branches path
  Revert "Revert "Fix Route validation for unchanged path""
  Document that we need rsync for backing up
  Docs: move article "Laravel and Envoy w/ CI/CD"
  Recommend against the use of EFS
  Adds Rubocop rule for line break around conditionals
  Update CHANGELOG.md for 10.1.6
  Filter out build traces from logged parameters
  Refactored project:n* imports in dispatcher.js
  ...
Revert "Merge branch 'pre-commit-prettier' into 'master'" 2018-01-04T09:13:26+00:00 Filipa Lacerda filipa@gitlab.com 2018-01-04T09:13:26+00:00 ecf6f1f8729119f7a7c4b9847a6a5c4eea331cab This reverts merge request !16061 
This reverts merge request !16061
 Merge branch 'pre-commit-prettier' into 'master' 2018-01-03T19:52:26+00:00 Robert Speicher robert@gitlab.com 2018-01-03T19:52:26+00:00 c8ddf067edf38f9f0e9c6c9bd226513db90f283a Pre commit prettier See merge request gitlab-org/gitlab-ce!16061 
Pre commit prettier

See merge request gitlab-org/gitlab-ce!16061
 Add check if run from gitlab development kit root directory. 2018-01-02T21:01:45+00:00 Jacob Schatz jschatz1@gmail.com 2018-01-02T21:01:45+00:00 2abf63899d449c74090a4149f508a61e766d47ec 






Check for symlink instead of file before install.
2018-01-02T20:57:45+00:00

Jacob Schatz
jschatz1@gmail.com

2018-01-02T20:57:45+00:00

f6e5772dfc08d31b407b659ae85153eed67d76a6












Update script to work only when run in the gitlab directory.
2018-01-02T20:49:39+00:00

Jacob Schatz
jschatz1@gmail.com

2018-01-02T20:49:39+00:00

981aac02f5700650397ed374f648ca25d55ea156












Fix `rake db:seed_fu` not doing anything in CI
2018-01-02T20:44:51+00:00

Stan Hu
stanhu@gmail.com

2017-12-27T13:41:28+00:00

ad88e3f88d2ac287f5a95952f95da4feae90944e

The default behavior of seed_fu is to load the fixtures using the RAILS_ENV
environment.  In CI, since we set RAILS_ENV=test, nothing is ever
loaded. Instead of `rake db:seed_fu`, use `rake gitlab:setup`, which sets up
MySQL properly with limits.

Closes #41517





The default behavior of seed_fu is to load the fixtures using the RAILS_ENV
environment.  In CI, since we set RAILS_ENV=test, nothing is ever
loaded. Instead of `rake db:seed_fu`, use `rake gitlab:setup`, which sets up
MySQL properly with limits.

Closes #41517







Use `Gitlab::Utils::Override` over defined?(super)
2017-12-26T09:18:10+00:00

Lin Jen-Shin
godfat@godfat.org

2017-12-25T10:20:50+00:00

8139895b4362817cf947431fab9c95ce223b87ae












Merge branch 'dz-add-sast' into 'master'
2017-12-23T14:19:51+00:00

Rémy Coutable
remy@rymai.me

2017-12-23T14:19:51+00:00

7fdb77625ec537010a08aef2ce8ea0bfded80495

Remove security checks from static analysis and add sast job

See merge request gitlab-org/gitlab-ce!16113




Remove security checks from static analysis and add sast job

See merge request gitlab-org/gitlab-ce!16113