Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve validation message and add changelogmc/fix/project-variables-scope | Kamil Trzciński | 2018-02-14 | 1 | -1/+1 |
| | |||||
* | Add more information in variable_duplicates validator error message | Matija Čupić | 2018-02-13 | 1 | -1/+1 |
| | |||||
* | Allow to use the latest migration in migration specs | Rémy Coutable | 2018-02-12 | 1 | -1/+7 |
| | | | | | | | This is useful for migration tests that relies on factories and that are very old and/or tedious to modify to not use factories. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Call .reset_column_in_all_models! before migrating in ↵ | Rémy Coutable | 2018-02-12 | 1 | -0/+2 |
| | | | | | | MigrationsHelpers.schema_migrate_up! Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Use the :migration metadata in migration specs | Rémy Coutable | 2018-02-12 | 1 | -4/+0 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Disable caching of tables for migration spec that drops a temporary table | Stan Hu | 2018-02-12 | 1 | -0/+4 |
| | | | | This is to fix job failures, such as https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/51409392. | ||||
* | Merge branch '42928-default-protected-variables-to-off' into 'master' | Filipa Lacerda | 2018-02-12 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | Default CI variables to unprotected Closes #42928 See merge request gitlab-org/gitlab-ce!17039 | ||||
| * | Default CI variables to unprotected42928-default-protected-variables-to-off | Eric Eastwood | 2018-02-09 | 1 | -4/+4 |
| | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/42928 | ||||
* | | Resolve failures in GitHub-ish import controller specsrs-pick-security | Robert Speicher | 2018-02-09 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'fix/gh-namespace-issue' into 'security-10-4' | James Lopez | 2018-02-09 | 1 | -3/+54 |
| | | | | | | | | [10.4] Fix GH namespace security issue | ||||
* | | Merge branch ↵ | Douwe Maan | 2018-02-09 | 1 | -0/+304 |
| | | | | | | | | | | | | 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibility' into 'security-10-4' [Port for security-10-4]: Makes SnippetFinder ensure feature visibility | ||||
* | | Replace $.post in importer status with axios | Clement Ho | 2018-02-09 | 1 | -32/+63 |
| | | |||||
* | | Make resetting column information overridable in EE | Sean McGivern | 2018-02-08 | 1 | -2/+7 |
|/ | |||||
* | Merge branch 'ce-4813-fix-ee-projects-destroy_service_spec' into 'master' | Sean McGivern | 2018-02-07 | 1 | -9/+13 |
|\ | | | | | | | | | | | | | Reset column information after the schema is migrated in MigrationsHelpers.schema_migrate_up! Closes gitlab-ee#4813 See merge request gitlab-org/gitlab-ce!16950 | ||||
| * | Reset column information after the schema is migrated in ↵ce-4813-fix-ee-projects-destroy_service_spec | Rémy Coutable | 2018-02-07 | 1 | -9/+13 |
| | | | | | | | | | | | | MigrationsHelpers.schema_migrate_up! Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master' | Robert Speicher | 2018-02-07 | 1 | -0/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182 | ||||
| * | | Make prometheus service querying approach much nicer wrt to arity and ↵ | Pawel Chojnacki | 2018-02-07 | 1 | -0/+6 |
| |/ | | | | | | | default function params | ||||
* | | Merge branch '41763-search-api' into 'master' | Sean McGivern | 2018-02-07 | 1 | -0/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Search API Closes #41763 See merge request gitlab-org/gitlab-ce!16878 | ||||
| * | | Return only limited pagination headers for search API endpoints | Jarka Kadlecová | 2018-02-06 | 1 | -0/+6 |
| |/ | |||||
* | | Fix duplicate CI variable feature spec failure | Matija Čupić | 2018-02-05 | 1 | -1/+1 |
| | | |||||
* | | Use dynamic variable list in scheduled pipelines and group/project CI secret ↵ | Eric Eastwood | 2018-02-05 | 1 | -0/+269 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | variables See https://gitlab.com/gitlab-org/gitlab-ce/issues/39118 Conflicts: app/views/ci/variables/_form.html.haml app/views/ci/variables/_table.html.haml ee/app/views/ci/variables/_environment_scope.html.haml spec/javascripts/ci_variable_list/ci_variable_list_ee_spec.js spec/javascripts/fixtures/projects.rb | ||||
* | | Fix validation of duplicate new variablesdynamic-pipeline-variables | Matija Čupić | 2018-02-05 | 1 | -0/+23 |
| | | |||||
* | | Extract Variables controllers specs to shared_examples | Matija Čupić | 2018-02-05 | 1 | -0/+100 |
|/ | |||||
* | Merge branch '24167__color_label' into 'master' | Douwe Maan | 2018-02-02 | 1 | -0/+21 |
|\ | | | | | | | | | | | | | Add Colors to GitLab Flavored Markdown Closes #24167 See merge request gitlab-org/gitlab-ce!16095 | ||||
| * | Add Colors to GitLab Flavored Markdown | Tony Rom | 2018-01-29 | 1 | -0/+21 |
| | | |||||
* | | use Gitlab::UserSettings directly as a singleton instead of ↵ | Mario de la Ossa | 2018-02-02 | 3 | -8/+4 |
| | | | | | | | | including/extending it | ||||
* | | port of 594e6a0a625^..f74c90f68c6 | Micaël Bergeron | 2018-02-01 | 4 | -28/+86 |
| | | |||||
* | | Fail static-analysis if there's output to stderr | Lin Jen-Shin | 2018-01-26 | 1 | -1/+0 |
|/ | | | | TODO: fix offenders | ||||
* | Merge branch 'jej/gitattributes-check-at-ref' into 'master' | Rémy Coutable | 2018-01-25 | 1 | -1/+1 |
|\ | | | | | | | | | 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 | -1/+1 |
| | | |||||
* | | Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL | Nick Thomas | 2018-01-24 | 1 | -0/+15 |
| | | |||||
* | | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' | Nick Thomas | 2018-01-24 | 2 | -7/+10 |
| | | |||||
* | | Merge branch 'gitaly-user-commit-files' into 'master' | Douwe Maan | 2018-01-23 | 2 | -7/+28 |
|\ \ | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPC Closes gitaly#890 See merge request gitlab-org/gitlab-ce!16307 | ||||
| * | | Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-files | Alejandro Rodríguez | 2018-01-22 | 1 | -3/+28 |
| | | | |||||
| * | | Ensure hooks are deleted regardless of the project forking method | Alejandro Rodríguez | 2018-01-19 | 1 | -4/+0 |
| | | | |||||
* | | | Merge branch '41532-email-reason' into 'master' | Sean McGivern | 2018-01-19 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Show why a notification email was sent Closes #41532 and #1366 See merge request gitlab-org/gitlab-ce!16160 | ||||
| * | | Initial work to add notification reason to emails | Mario de la Ossa | 2018-01-16 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `#build_notification_recipients` to `NotificationRecipientService` that returns the `NotificationRecipient` objects in order to be able to access the new attribute `reason`. This new attribute is used in the different notifier methods in order to add the reason as a header: `X-GitLab-NotificationReason`. Only the reason with the most priority gets sent. | ||||
* | | | Improve MR feature specs and reduce duplicationrc/improve-mr-feature-specs | Rémy Coutable | 2018-01-18 | 2 | -0/+239 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3' | Robert Speicher | 2018-01-16 | 2 | -6/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.3] Prevent login with disabled OAuth providers See merge request gitlab/gitlabhq!2296 (cherry picked from commit 4936650427ffc88e6ee927aedbb2c724d24b094c) a0f9d222 Prevents login with disabled OAuth providers | ||||
* | | | Merge branch '41567-projectfix' into 'security-10-3' | Sean McGivern | 2018-01-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check project access on MR create See merge request gitlab/gitlabhq!2273 (cherry picked from commit 1fe2325d6ef2bced4c5e97b57691c894f38b2834) 43e85f49 check project access on MR create | ||||
* | | | Merge branch ↵ | Stan Hu | 2018-01-16 | 1 | -6/+2 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | 'security-10-3-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-3' Filter out sensitive fields from the project services API See merge request gitlab/gitlabhq!2281 (cherry picked from commit 476f2576444632f2a9a61b4cead9c1077f2c81d7) 2bcbbda0 Filter out sensitive fields from the project services API | ||||
* | | Use an at_exit hook to stop test gitalystop-gitaly-atexit | Jacob Vosmaer | 2018-01-15 | 1 | -5/+3 |
| | | |||||
* | | Adds Rubocop rule for line break around conditionals | 🙈 jacopo beschi 🙉 | 2018-01-11 | 8 | -0/+10 |
| | | |||||
* | | Refactor GCP redirect test suite | Matija Čupić | 2018-01-11 | 1 | -4/+43 |
|/ | |||||
* | Merge branch 'master' into ↵ | Matija Čupić | 2018-01-05 | 4 | -1/+230 |
|\ | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled | ||||
| * | Merge branch 'ce-backport=reorder-issues' into 'master' | Sean McGivern | 2018-01-05 | 1 | -1/+14 |
| |\ | | | | | | | | | | | | | CE Backport of reordering issues in epics See merge request gitlab-org/gitlab-ce!16247 | ||||
| | * | Refactor matchers for background migrationsce-backport=reorder-issues | Jarka Kadlecová | 2018-01-05 | 1 | -1/+14 |
| | | | |||||
| * | | API: get participants from merge_requests & issues | Brent Greeff | 2018-01-05 | 1 | -0/+29 |
| | | | |||||
| * | | Merge branch 'backport-issue_3413' into 'master' | Sean McGivern | 2018-01-05 | 1 | -0/+180 |
| |\ \ | | | | | | | | | | | | | | | | | [EE-backport] Add group boards API endpoint See merge request gitlab-org/gitlab-ce!16194 | ||||
| | * | | EE-BACKPORT group boards | Felipe Artur | 2018-01-04 | 1 | -0/+180 |
| | | | |