Commit Graph

109 Commits

Author SHA1 Message Date
Grzegorz Bizon c5912ecd73 Merge branch 'master' into feature/multi-level-container-registry-images
* master: (1327 commits)
  Merge branch 'render-json-leak' into 'security'
  Merge branch 'ssrf' into 'security'
  Merge branch 'ssrf' into 'security'
  Merge branch 'fix-links-target-blank' into 'security'
  Merge branch '28058-hide-emails-in-atom-feeds' into 'security'
  Fix karma test
  Reset filters after click
  Handle Route#name being nil after an update
  Only add frontend code coverage instrumentation when generating coverage report
  fix recompile assets step in 9.0 upgrade guide to use yarn
  Undo explicit conversion to Integer
  Make level_value accept string integers
  Make feature spec more robust
  Removed d3.js from the main application.js bundle
  Extend compound status for manual actions specs
  Update css to be nice and tidy.
  Fix pipeline status for transition between stages
  add an index to the ghost column
  Return 404 in project issues API endpoint when project cannot be found
  Improve rename projects migration
  ...

Conflicts:
	doc/ci/docker/using_docker_build.md
	spec/lib/gitlab/import_export/all_models.yml
2017-03-21 14:22:56 +01:00
Grzegorz Bizon 53d332d3c7 Add configured container registry key to .gitignore 2017-03-21 13:39:57 +01:00
Mike Greiling 9a11acabb9 add webpack bundle analyzer to production output 2017-02-21 16:29:35 -06:00
winniehell 459cd939e7 Generate ESLint HTML report (!7374) 2016-11-22 20:25:33 +01:00
winniehell e5a0d41db0 add ESLint
ESLint config: https://github.com/airbnb/javascript
2016-10-26 10:00:55 +02:00
Jacob Vosmaer c87540ed46 Verify JWT messages from gitlab-workhorse 2016-09-05 15:05:31 +02:00
winniehell 5e1ac6275f Add test coverage analysis for CoffeeScript (!5052) 2016-08-07 21:52:37 +02:00
Ruben Davila f0930feac9 Use absolute paths wherever is possible for .gitignore entries. 2016-05-29 16:55:25 -05:00
Ruben Davila 1c09c21a97 Ignore files under "/shared" directory and not other subdirectories that contains that name
It's working fine now but by making it more explicit we can make tools
like 'The Silver Searcher' to parse properly the .gitignore file
2016-05-29 16:55:25 -05:00
Zeger-Jan van de Weg 639cad7e30 Ignore .byebug_history 2016-03-09 20:43:54 +01:00
Artem Sidorenko 28ba8ed5f5 Use dedicated relative_url.rb initializer
in order to have it the same way like in omnibus
2016-02-29 21:17:48 +01:00
The rugged tests are fragile c12514fc2d Ignore config/sidekiq.yml [ci skip] 2015-12-15 15:05:57 +08:00
Marin Jankovski 14032d8eb1 Add support for git lfs. 2015-11-16 12:39:13 +01:00
Kamil Trzcinski 445cdb7579 Move tmp artifacts to shared/artifacts/tmp/. Check for GitLab-Workhorse now 2015-11-10 12:51:51 +01:00
Kamil Trzcinski d0e3e823a2 Implement Build Artifacts
- Offloads uploading to GitLab Workhorse
- Use /authorize request for fast uploading
- Added backup recipes for artifacts
- Support download acceleration using X-Sendfile
2015-11-10 12:51:50 +01:00
Douwe Maan 712d17684b Make Reply by email easier to configure 2015-10-13 13:10:49 +02:00
Kamil Trzcinski c9d914a392 Fix builds directory store 2015-09-15 22:53:38 +02:00
Douwe Maan 843694f902 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-08-26 17:53:31 -07:00
Douwe Maan 6afd69f444 Update gitignore, change literal DB table names, fix errors, fix fontawesome 2015-08-26 17:47:18 -07:00
Douwe Maan f76eac56b9 Reply by email POC 2015-08-18 15:46:36 -07:00
Sytse Sijbrandij 60887cf949 Remove the volumes from the single image to keep it simple. 2015-05-07 10:47:24 +02:00
Sytse Sijbrandij cb4e16b7a3 Ignore mounted Docker directories. 2015-05-07 10:24:38 +02:00
Douwe Maan e0a1d54e1a Don't ignore any folder called tags :| 2015-04-30 21:32:44 +02:00
Ciro Santilli f7274dd6a1 Sort .gitignore. 2014-11-29 10:48:19 +01:00
Valery Sizov b5763e91cd add gitlab-shell identification 2014-10-15 20:03:25 +03:00
Ciro Santilli ee8be80ce7 Ignore tags file. 2014-09-19 08:52:42 +02:00
William Herry 3410aaf950 add smtp_settings.rb to gitignore file 2014-06-03 01:05:07 +08:00
Jeroen van Baarsen b3ad3f2024 Added the dump.rdb file to gitignore
Whenever i'm working on GitLab I have redis running, but redis is
generating a db dump file called dump.rdb, I dont think that should be
checked in, so it should be on the gitignore list
2014-04-06 13:29:29 +02:00
Jeroen van Baarsen 9583631666 Add envrc to git-ignore
envrc files are created when you use direnv (Its recommended in
combination with spring, see: https://github.com/rails/spring#setup)
2014-03-06 15:55:57 +01:00
Dmitriy Zaporozhets 1018cbdc80
Add public assets to gitignore
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 11:18:34 +02:00
Marin Jankovski 055b60d420 Add documentation to help section, rack_attack as example 2013-09-30 11:10:46 +02:00
Yatish Mehta 1b1c81b175 Added .ruby-version & .ruby-gemset in .gitignore 2013-09-16 19:19:04 +05:30
Sytse Sijbrandij 7c55c73d63 Fix confusing situation where install guide told you to install init.d script for puma. 2013-08-19 21:54:12 +02:00
Dmitriy Zaporozhets 02e859a234 move backup logic to lib. Fixed removing outdated backups 2013-08-05 12:26:33 +03:00
Dmitriy Zaporozhets 7683efc6be Added ability to close milestone with opened issues. UI for milestone page improved 2013-08-02 13:44:25 +03:00
ash e444c7f6ba Generate the Rails secret token on first run.
Store the secret token in a .gitignored file called ".secret", which is
created by the initializer if it doesn't exist.
2013-05-22 23:55:48 +00:00
Dmitriy Zaporozhets 1fe61284af Replace unicorn with Puma 2013-04-04 23:19:24 +03:00
Dmitriy Zaporozhets b87ef427e9 Merge pull request #2990 from raphendyr/gitignore_and_logrotate
Change .gitignore to ignore logrotated log files.
2013-02-18 10:01:09 -08:00
Dmitriy Zaporozhets b729728536 uppercase Gitlab version and revision constants. check api return gitlab version now 2013-02-16 14:42:22 +02:00
Jaakko Kantojärvi 1bf79f2443 Change .gitignore to ignore logrotated log files. 2013-02-14 17:43:20 +02:00
Dmitriy Zaporozhets 38737079b6 ignore docs by git 2013-02-09 15:26:47 +02:00
VonC 3aa5daf696 gitignore updates.
Most yml files are ignored in gitlab/config/, except resque.yml
=> add it to the list of ignored files.
2013-01-09 16:39:43 +00:00
Dmitriy Zaporozhets 39ba934c0a REpostiry, Team models 2013-01-03 21:09:18 +02:00
Dmitriy Zaporozhets c19e766f1e Added vendor/bundle to gitignore. Removed project js slugify 2012-11-30 19:49:51 +02:00
Sytse Sijbrandij adb724f65e Ignore chef dir. 2012-09-05 22:22:33 +02:00
Jeremy Anderson 0301ba3315 updated gitignore and added rake 0.8.7 to Gemfile because of errors 2012-07-24 11:41:26 -07:00
Dmitriy Zaporozhets 214fdd2d2f Ignore backups dir 2012-07-19 12:52:28 +03:00
Dmitriy Zaporozhets 43f5df21a3 gitlab rake tasks refactored 2012-04-04 01:02:54 +03:00
Pat Thoyts 6e27350aac Move OmniAuth configuration details into a non-revision controlled file.
Provide an omniauth.rb.sample file to avoid encouraging end-users to commit
their provider access details (passwords or api tokens) into their git
repositories.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-03-23 15:35:55 +00:00
Ariejan de Vroom b27f8fd503 Ignore db/data.yml after running `rake db:dump`. 2012-03-14 11:39:40 +02:00
Christos Trochalakis 75f040fbfe Don't enforce rbenv version
It would be better not include either rbenv or a specific rbenv version
with gitlab.
2012-02-24 17:39:14 +02:00
Dmitriy Zaporozhets 9edbac5ac8 Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples
Conflicts:
	.gitignore
2012-02-19 11:39:28 +02:00
Saito 8569317367 add vagrant file to ignore list 2012-02-13 16:39:35 +08:00
Dmitriy Zaporozhets 7f92534f76 pybments.rb version up. gitignore improved 2012-01-12 00:33:54 +02:00
shtirlic 188e451c76 Add .directory to .gitignore 2012-01-01 21:43:08 +04:00
Artiom Lunev e74fae147a rename database config to example 2011-12-12 21:49:40 +02:00
Artiom Lunev 86f76b11c6 rename gitlab config file to example 2011-12-12 21:47:00 +02:00
Brendan Stennett 8524d194e2 .rvmrc not gitted anymore 2011-12-10 19:41:05 -05:00
gitlabhq 93efff9452 gitignore 2011-10-09 00:34:49 +03:00