summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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-084-4/+4
|\ \ | | | | | | | | | | | | 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-074-4/+4
| | |
* | | remove the rouge copypasta and add notes to refactorhttp://jneen.net/2017-06-072-28/+4
| | |
* | | Translate project & repository pagesBob Van Landuyt2017-06-0711-23/+23
| | |
* | | Merge branch 'krakowski_master2' into 'master'Grzegorz Bizon2017-06-071-20/+31
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add all pipeline sources as special keywords to 'only' and 'except' Closes #32955 See merge request !11972
| * | use squre bracketShinya Maeda2017-06-081-1/+1
| | |
| * | Use source instead of trigger_requests in stage_seedsShinya Maeda2017-06-082-5/+2
| | |
| * | Remove source.nilShinya Maeda2017-06-081-3/+3
| | |
| * | Fix conditionShinya Maeda2017-06-082-4/+7
| | |
| * | Fix unmatches_pathShinya Maeda2017-06-081-6/+9
| | |
| * | Fix change in behaviorFilip Krakowski2017-06-081-8/+8
| | |
| * | Check if source is nilFilip Krakowski2017-06-081-1/+1
| | |
| * | Fix static-analysis offensesFilip Krakowski2017-06-081-1/+1
| | |
| * | Add all sources as special keywords for only and exceptFilip Krakowski2017-06-081-4/+11
| | |
| * | Use pipeline.source to determine what triggered a pipelineFilip Krakowski2017-06-081-16/+16
| | |
| * | Add 'schedules' keyword to 'only' and 'except'Filip Krakowski2017-06-081-14/+15
| | |
* | | 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 'fix/backup-restore-resume' into 'master'James Lopez2017-06-071-38/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix backup task to continue on corrupt repositories Closes #31767 See merge request !11962
| * | | | fix typofix/backup-restore-resumeJames Lopez2017-06-071-1/+1
| | | | |
| * | | | fix wikiJames Lopez2017-06-071-1/+1
| | | | |
| * | | | refactor code and specJames Lopez2017-06-071-25/+21
| | | | |
| * | | | fix backup task to ignore errors per projectJames Lopez2017-06-071-26/+29
| | |_|/ | |/| |
* | | | 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.
* | | | Merge branch 'fix_rubocop_warning_about_has_key' into 'master'Grzegorz Bizon2017-06-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use key? instead of has_key? See merge request !11971
| * | | | Use key? instead of has_key? methodfix_rubocop_warning_about_has_keyPawel Chojnacki2017-06-071-1/+1
| | | | |
* | | | | Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-071-0/+21
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Implement ability to update deploy keys Closes #3191 See merge request !10383
| * | | | Implement ability to update deploy keysAlexander Randa2017-06-021-0/+21
| | | | |
* | | | | 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-075-5/+68
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persist stages in the database Closes #26481 See merge request !11790
| * \ \ \ \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into ↵Grzegorz Bizon2017-06-0620-143/+422
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-05124-1178/+2764
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-023-68/+58
| | | | | | | |
| * | | | | | | Rename pipeline methods related to legacy stagesGrzegorz Bizon2017-06-011-1/+1
| | | | | | | |
View Lorry Controller Status