diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-04 20:04:39 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-04 20:04:39 +0100 |
| commit | 85b45ce94de94a85bb341d2978f1471a21b9a0ff (patch) | |
| tree | ab65c6cfefc07fd2a65c20e15d7fda98047886bb /.gitignore | |
| parent | dd3b1526af1675f7686f189ec41b8d919b6835a2 (diff) | |
| parent | cb5bb4dbc67c5dd43bb7b27faf79ca79f8ae3e1f (diff) | |
| download | gitlab-ce-85b45ce94de94a85bb341d2978f1471a21b9a0ff.tar.gz | |
[ci skip] Merge branch 'master' into 44427-state-management-with-vuex
* master: (544 commits)
Bulk deleting refs is handled by Gitaly by default
Allow assigning and filtering issuables by ancestor group labels
Fix links to subdirectories of a directory with a plus character in its path
Add banzai filter to detect commit message trailers and properly link the users
Render MR commit SHA instead "diffs" when viable
Fix a transient failure by removing unneeded expectations
Revert changelog entry for removed feature
Revert "Allow CI/CD Jobs being grouped on version strings"
Add support for Sidekiq JSON logging
Resolve "Protected branches count is wrong when a wildcard includes several protected branches"
Remove unused form for admin application settings
Use standard codequality job
Resolve "Allow the configuration of a project's merge method via the API"
Move the rest of application settings to expandable blocks
[Rails5] Rename `sort` methods to `sort_by_attribute`
Add better LDAP connection handling
Updated components to PascalCase
Handle invalid params when trying update_username
Move network related app settings to expandable blocks
[Rails5] Update Gemfile.rails5.lock [ci skip]
...
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 447fb71bd64..e9ff0048c1c 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ eslint-report.html /db/data.yml /doc/code/* /dump.rdb +/jsconfig.json /log/*.log* /node_modules/ /nohup.out |