summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-122-3/+3
| | | | | This was edited to the request, but this won't work if the data is not available at the time of setting the key for the first time.
* Fix etag route missesZ.J. van de Weg2017-06-121-2/+2
| | | | Fixes gitlab-org/gitlab-ce#33106
* Raise exception on invalid pipeline cacheKamil Trzcinski2017-06-121-0/+2
|
* Merge branch 'cache-diff-size-limits' into 'master'Douwe Maan2017-06-091-2/+18
|\ | | | | | | | | Only look up diff size limit flags once per request See merge request !12048
| * Only look up diff size limit flags once per requestcache-diff-size-limitsSean McGivern2017-06-091-2/+18
| |
* | Merge branch 'pat-msg-on-auth-failure' into 'master'Rémy Coutable2017-06-091-1/+5
|\ \ | | | | | | | | | | | | Prompt user to create personal access token for Git over HTTP See merge request !11986
| * | Instruct user to use a personal access token for Git over HTTPRobin Bobbitt2017-06-071-1/+5
| |/ | | | | | | | | | | If internal auth is disabled and LDAP is not configured on the instance, present the user with a message to create a personal access token if his Git over HTTP auth attempt fails.
* | Merge branch 'dm-blob-binaryness-change' into 'master'Sean McGivern2017-06-091-0/+1
|\ \ | | | | | | | | | | | | Detect if blob binaryness changes after loading all data See merge request !11981
| * | Detect if file that appears to be text in the first 1024 bytes is actually ↵dm-blob-binaryness-changeDouwe Maan2017-06-081-0/+1
| | | | | | | | | | | | binary afer loading all data
* | | Merge branch 'upstream-9-2-security' into master-security-updateDJ Mountney2017-06-082-1/+2
|\ \ \ | |/ / |/| |
| * | Bring in security changes from the 9.2.5 releaseDJ Mountney2017-06-072-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
* | Merge branch 'dm-diff-file-diffable' into 'master'Sean McGivern2017-06-083-9/+13
|\ \ | | | | | | | | | | | | Move diffable? method from Repository to Diff::File See merge request !11980
| * | Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-083-22/+38
| | |
* | | Merge branch 'dm-highlight-diff-file-blob' into 'master'Sean McGivern2017-06-083-27/+36
|\ \ \ | | | | | | | | | | | | | | | | Use Diff::File blob methods from diff highlighter See merge request !11978
| * | | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-083-27/+36
| |/ /
* | | Merge branch '33383_add_bulgarian_translation_of_cycle_analytics_page' into ↵Douwe Maan2017-06-081-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add bulgarian translation of Cycle Analytics Page to I18N Closes #33383 See merge request !11958
| * | | add bulgarian translation of cycle analytics page to I18N黄涛2017-06-071-1/+2
| | | | | | | | | | | | | | | | Fix #33383
* | | | Merge branch ↵Douwe Maan2017-06-081-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '33334_add_portuguese_brazil_translation_of_cycle_analytics_page' into 'master' Add portuguese brazil translation of Cycle Analytics Page to I18N Closes #33334 See merge request !11920
| * | | Update i18n.rb styleHuang Tao2017-06-071-1/+1
| | | |
| * | | add portuguese brazil translation of cycle analytics page黄涛2017-06-071-0/+1
| |/ / | | | | | | | | | Fix #33334
* | | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-082-2/+2
|\ \ \ | |_|/ |/| | | | | | | | Blob#load_all_data! doesn’t need an argument See merge request !11977
| * | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-072-2/+2
| | |
* | | Translate project & repository pagesBob Van Landuyt2017-06-0711-23/+23
|/ /
* | Added more actions and report as abuse to all notesLuke "Jared" Bennett2017-06-071-1/+6
| |
* | Merge branch 'backport_fix_slash_commands_for_multiple_assignee' into 'master'Douwe Maan2017-06-072-4/+10
|\ \ | | | | | | | | | | | | Backport from EE: Fix '/unassign' slash command See merge request !11926
| * | Backport Fix '/unassign' slash commandbackport_fix_slash_commands_for_multiple_assigneeValery Sizov2017-06-072-4/+10
| | |
* | | Merge branch 'sync-email-from-omniauth' into 'master'Douwe Maan2017-06-072-9/+21
|\ \ \ | | | | | | | | | | | | | | | | Sync email address from specified omniauth provider See merge request !11268
| * | | Sync email address from specified omniauth providerRobin Bobbitt2017-06-072-9/+21
| | | |
* | | | Merge branch 'fix-memoization-in-contributions-calendar' into 'master'Rémy Coutable2017-06-071-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fix memoization in ContributionsCalendar#activity_dates See merge request !11973
| * | | Fix memoization in ContributionsCalendar#activity_datesfix-memoization-in-contributions-calendarSean McGivern2017-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | This doesn't appear to be actually called twice, but having it appear to work but not would be a problem if it was.
* | | | Use key? instead of has_key? methodfix_rubocop_warning_about_has_keyPawel Chojnacki2017-06-071-1/+1
| | | |
* | | | Merge branch 'dm-diff-file-straight-diff' into 'master'Sean McGivern2017-06-074-18/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Diff::Position#diff_file for positions on straight diffs See merge request !11947
| * | | | Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diffDouwe Maan2017-06-064-18/+14
| |/ / /
* | | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-074-1/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persist stages in the database Closes #26481 See merge request !11790
| * \ \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into ↵Grzegorz Bizon2017-06-0610-87/+267
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: (76 commits) redesign caching of application settings Fix binary encoding error on MR diffs Fix missing tooltip and ARIA labels for accessibility Add info on using self-signed certs with Registry Actually clean gitlab-test path when TestEnv.set_repo_refs fails Introduce optimistic locking support via optional parameter last_commit_id on File Update API Move issuable bulk edit form into a new sidebar. Add PowerShell to CI variable docs Responsive environment tables Accept a username for User-level Events API Introduce an Events API Update GitLab Pages to v0.4.3 Allow numeric pages domain Remove references to old settings location Resolve "API: Environment info missed" Fix Projects API spec Resolve "When changing project visibility setting, change other dropdowns automatically" Update explanation of job-level variable override to fit example change headings to improve SEO backports changed import logic from pull mirroring feature into CE ...
| * | | | Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-0563-591/+1453
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (524 commits) Improve user experience around slash commands in instant comments Fix LFS timeouts when trying to save large files retryable? is now available for CommitStatus Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables" Fix test failures Add slugify project path to CI enviroment variables Fixed typo: craeted -> created 32118 Make New environment empty state btn lowercase Expose import_status in Projects API 32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon Fix test failures Allow manual bypass of auto_sign_in_with_provider Fix keys seed Allow users to be hard-deleted from the API fixup some classnames and media queries Enable the Style/PreferredHashMethods cop Lint our factories creation in addition to their build Don’t schedule workers from inside transactions Allow scheduling from after_commit hooks Forbid Sidekiq scheduling in transactions ... Conflicts: app/serializers/pipeline_entity.rb db/schema.rb spec/factories/ci/stages.rb spec/lib/gitlab/import_export/safe_model_attributes.yml spec/services/ci/create_pipeline_service_spec.rb spec/spec_helper.rb
| * | | | | Export pipeline stages in import/export featureGrzegorz Bizon2017-06-052-0/+2
| | | | | |
| * | | | | Refine implementation of pipeline stage seedsGrzegorz Bizon2017-06-022-62/+49
| | | | | |
| * | | | | Rename pipeline methods related to legacy stagesGrzegorz Bizon2017-06-011-1/+1
| | | | | |
| * | | | | Return stage seeds object from YAML processorGrzegorz Bizon2017-05-311-1/+5
| | | | | |
| * | | | | Refine pipeline stages seeds classGrzegorz Bizon2017-05-312-38/+58
| | | | | |
| * | | | | Add stage seed class that represents attributesGrzegorz Bizon2017-05-301-0/+38
| | | | | |
* | | | | | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-075-154/+264
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Prometheus metrics endpoint and basic infrastructure to meter code See merge request !11553
| * | | | | | Make PrometheusTextFormat return proper output terminated with '\n'Pawel Chojnacki2017-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | remove file dangling after rebase
| * | | | | | Add missing trailing newlinesPawel Chojnacki2017-06-023-3/+3
| | | | | | |
| * | | | | | Fix circular dependency condition with `current_application_settings`Pawel Chojnacki2017-06-021-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `current_application_settings` used by `influx_metrics_enabled` executed a markdown parsing code that was measured using `Gitlab::Metrics.measure` But since the Gitlab::Metrics::InfluxDb was not yet build so Gitlab::Metrics did not yet have `measure` method. Causing the NoMethodError. However If run was successful at least once then result was cached in a file and this code never executed again. Which caused this issue to only show up in CI preparation step.
| * | | | | | Split the metrics implementation to separate modules for Influx and PrometheusPawel Chojnacki2017-06-024-219/+235
| | | | | | |
| * | | | | | Add prometheus text formatterPawel Chojnacki2017-06-022-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + rename controler method to #index from #metrics + remove assertion from nullMetric
| * | | | | | Move Prometheus presentation logic to PrometheusTextPawel Chojnacki2017-06-023-17/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Use NullMetrics to mock metrics when unused + Use method_missing in NullMetrics mocking + Update prometheus gem to version that correctly uses transitive dependencies + Ensure correct folders are used in Multiprocess prometheus client tests. + rename Sessions controller's metric
| * | | | | | Add tests for metrics behaviorPawel Chojnacki2017-06-021-7/+9
| | | | | | |
View Lorry Controller Status