Commit Graph

109 Commits

Author SHA1 Message Date
GitLab Bot 5c763ac4c6 Add latest changes from gitlab-org/gitlab@master 2020-05-27 06:08:13 +00:00
GitLab Bot c9d79ef3b5 Add latest changes from gitlab-org/gitlab@master 2020-05-26 15:08:17 +00:00
GitLab Bot ae4ef81757 Add latest changes from gitlab-org/gitlab@master 2020-03-20 18:09:31 +00:00
GitLab Bot 154b9bae14 Add latest changes from gitlab-org/gitlab@master 2020-03-17 21:09:16 +00:00
GitLab Bot 7c38405be9 Add latest changes from gitlab-org/gitlab@master 2020-03-10 15:08:08 +00:00
GitLab Bot a8c82a6395 Add latest changes from gitlab-org/gitlab@master 2020-02-25 03:08:49 +00:00
GitLab Bot 50ae406553 Add latest changes from gitlab-org/gitlab@master 2020-01-30 12:08:54 +00:00
GitLab Bot 1ea1db491c Add latest changes from gitlab-org/gitlab@master 2020-01-27 15:08:51 +00:00
GitLab Bot e0b84f4ba4 Add latest changes from gitlab-org/gitlab@master 2020-01-08 21:08:08 +00:00
GitLab Bot 4aeb8a02c5 Add latest changes from gitlab-org/gitlab@master 2019-12-23 12:08:18 +00:00
GitLab Bot be59dd1d43 Add latest changes from gitlab-org/gitlab@master 2019-12-20 21:08:00 +00:00
GitLab Bot 8d3aee3636 Add latest changes from gitlab-org/gitlab@master 2019-12-04 15:11:23 +00:00
GitLab Bot 68d3f33d51 Add latest changes from gitlab-org/gitlab@master 2019-11-26 15:06:50 +00:00
GitLab Bot 16d9f66e96 Add latest changes from gitlab-org/gitlab@master 2019-11-18 12:06:03 +00:00
GitLab Bot 3fc9a8e695 Add latest changes from gitlab-org/gitlab@master 2019-11-15 12:06:12 +00:00
GitLab Bot 3fdbfaf3e5 Add latest changes from gitlab-org/gitlab@master 2019-09-25 18:06:17 +00:00
Krasimir Angelov 477ba2b346 Add skeleton Pages internal API
Basic `/internal/pages` endpoint that will be used for Pages virtual
domains internal API. The endpoint is currently behind feature flag and
provides authetication similar to how Workhorse is authenticating with
the GitLab.
2019-09-06 16:06:25 +12:00
Yorick Peterse 55063f854d
Fix Git ignore for tmp/, shared/, and plugins/
The old rules meant that any future changes to these directories would
require the use of `git add -f` to be staged. This is problematic for
the upcoming FOSS-only mirror of GitLab. Any changes to be synced to
this mirror are staged using `git add --all .`, which due to the Git
ignore rules would not add the tmp/ and shared/ directories. This then
leads to various specs failing because they expect certain
sub-directories of these directories to be available.

This commit changes the rules so that we include the .gitkeep files,
ignore other files, and completely ignore anything in tmp/test. This
requires that the rules are specified in tmp/.gitignore and
shared/.gitignore, instead of the top-level .gitignore, without this I
could not get Git to include the .gitkeep files properly.
2019-09-03 17:03:53 +02:00
Giorgenes Gelatti 2fb6c9f3c7 Adds basic overcommit support 2019-09-02 05:38:27 +00:00
Diego Louzán 0dcb9d21ef feat: SMIME signed notification emails
- Add mail interceptor the signs outgoing email with SMIME
- Add lib and helpers to work with SMIME data
- New configuration params for setting up SMIME key and cert files
2019-08-20 16:13:32 +02:00
Nathan Friend 6fa7fddd90
Ignore tmp/rubocop_cache directories
This commit ignores the temporary cache directories that I _think_ are
created by the VSCode Ruby extension.
2019-05-23 12:42:51 -03:00
Winnie Hellmann 5990d42253 Ignore PDF and balsamiq fixture files
(cherry picked from commit 1b33828811897b6a3f8a38044cc0839b87098d1f)
2019-05-02 23:11:12 +02:00
Winnie Hellmann 7999ca3224 Generate searchable JSDoc documentation 2019-01-14 21:46:21 +00:00
Winnie Hellmann a8a13d3259 Setup Jest test environment 2018-12-05 09:24:42 +01:00
Andrew Newdigate 1065f8ce7a Add experimental support for Puma
This allows us (and others) to test drive Puma without it affecting all
users. Puma can be enabled by setting the environment variable
"EXPERIMENTAL_PUMA" to a non empty value.
2018-10-25 17:50:15 +01:00
Winnie Hellmann 01b669640a Generate JUnit report for Karma tests 2018-09-11 21:03:05 +00:00
Kamil Trzciński 789fae50fb Enable JUnit results for rspec 2018-09-03 14:59:55 +02:00
Zeger-Jan van de Weg 51826849ab
Exclude Geo DB Yaml on CE too
For Geo, a file is created for configuration of the database. This file
shouldn't appear in CE, but if you've setup your GDK with a remote
pointing to CE and one to EE, this file might be around when switching
branches.

This will mark the workspace dirty, which annoys me more than it should.

[ci skip]
2018-06-25 14:38:55 +02:00
Dimitrie Hoekstra e36436fe9d Update .gitignore with ignoring package-lock.json 2018-06-15 12:32:22 +00:00
Jacob Vosmaer a3268f971d Add /vendor/gitaly-ruby to gitignore 2018-05-30 18:49:50 +02:00
Lin Jen-Shin e178b0a287 Ignore knapsack and rspec_flaky 2018-05-04 20:51:03 +08:00
Jacob Vosmaer (GitLab) 7da1b4cbf1 Add gitlab-pages admin ping rake task 2018-04-27 11:01:54 +00:00
Simon Knox d6eb56d682 gitignore for vscode config file 2018-03-28 18:13:42 +11:00
Tim Zallmann 51e454f3b1 Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation 2018-03-14 19:32:36 +00:00
Mike Greiling b6a59ccc8f Remove sync script for gitlab-svgs and reference the vendored library directly 2018-03-09 21:32:11 +00:00
Dmitriy Zaporozhets 84097def3c Add /plugins to gitignore
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-02-26 16:06:49 +02:00
Dmitriy Zaporozhets 645dceb0a2 Run plugins as separate process and pass data via STDIN
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-02-26 16:06:49 +02:00
Dmitriy Zaporozhets 1ffa07e6f3 Ignore content in plugins dir
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-02-26 16:06:49 +02:00
Phil Hughes a022e8f192
Added .rej files to gitignore
[ci skip]
2018-01-12 12:31:21 +00:00
Achilleas Pipinellis fda5707273
Git ignore po files ending in time_stamp
[ci skip]
2017-10-02 08:09:58 +02:00
Paul Charlton cb3b4a15e6 Support multiple Redis instances based on queue type 2017-07-11 03:35:47 +00:00
Jacob Vosmaer adc00877ad Allow developers to have custom rspec output settings 2017-06-30 14:52:27 +02:00
Ruben Davila bea0d4e48a Ignore JSON files generated from PO files 2017-06-27 13:39:33 -05:00
Mike Greiling e5a18cd731 instruct yarn to utilize the persistant .yarn-cache directory 2017-05-16 00:18:45 -05:00
Luke "Jared" Bennett b504b09b68 Added balsamiq jasmine integration test 2017-05-15 07:48:54 +00:00
Ruben Davila bbfbcebdf6 Merge branch 'master' into 28433-internationalise-cycle-analytics-page 2017-05-02 13:20:41 -05:00
Phil Hughes 54beb93ac3 Merge branch 'pdflab-in-repo' into 'master'
Move PDFLab assets into repo

See merge request !10642
2017-05-02 07:35:49 +00:00
Sam Rose 9f3985c613 Move PDFLab into GitLab 2017-04-28 12:52:36 -04:00
Achilleas Pipinellis 119707d37a Ignore all builds* directories from version control
The restore process copies the old builds/ dir into builds.<epoch>/
which results in Git complaining about untracked files
2017-04-25 12:09:13 +02:00
Ruben Davila 72fefba4c1 Ignore some files required to the translation process 2017-04-13 01:08:44 -05:00