diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-06-15 15:43:12 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-06-15 15:43:12 +0800 |
| commit | e75391889e8bb13f9ead60eac88ffac5d9081f78 (patch) | |
| tree | 10fd092d4011a923cfb8dd79d469061d3fb0aa4a /vendor/gitignore/Global/CodeKit.gitignore | |
| parent | 8c0b619d40e4d113ef592f4ae7a4b6afa320f225 (diff) | |
| parent | bf4455d14659f1fde6391164b38310d361bf407d (diff) | |
| download | gitlab-ce-e75391889e8bb13f9ead60eac88ffac5d9081f78.tar.gz | |
Merge branch 'master' into new-issue-by-email
* master: (1246 commits)
Update CHANGELOG
Update tests to make it work with Turbolinks approach
Use Turbolink instead of ajax
Reinitialize checkboxes to toggle event bindings
Turn off handlers before binding events
Removed console.log Uses outerWidth instead of width
Revert "Added API endpoint for Sidekiq Metrics"
Added API endpoint for Sidekiq Metrics
Added CHANGELOG entry for allocations Gem/name fix
Filter out classes without names in the sampler
Update the allocations Gem to 1.0.5
Put all sidebar icons in fixed width container
Instrument private/protected methods
Fix Ci::Build#artifacts_expire_in= when assigning invalid duration
Fix grammar and syntax
Update CI API docs
UI and copywriting improvements
Factorize members mails into a new Emails::Members module
Factorize access request routes into a new :access_requestable route concern
Factorize #request_access and #approve_access_request into a new AccessRequestActions controller concern
...
Diffstat (limited to 'vendor/gitignore/Global/CodeKit.gitignore')
| -rw-r--r-- | vendor/gitignore/Global/CodeKit.gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vendor/gitignore/Global/CodeKit.gitignore b/vendor/gitignore/Global/CodeKit.gitignore new file mode 100644 index 00000000000..bd9e67fcca2 --- /dev/null +++ b/vendor/gitignore/Global/CodeKit.gitignore @@ -0,0 +1,3 @@ +# General CodeKit files to ignore +config.codekit +/min |