6474c67d20
Remove spaces
2017-04-07 12:53:30 +02:00
7ecc7f6a56
Remove unused code
2017-04-07 12:53:30 +02:00
e4ac948c70
Send more Gitaly::Repository fields
2017-04-07 12:53:30 +02:00
c3e43c9ba3
Add /-/readiness /-/liveness and /-/health_metrics endpoints to track application readiness
2017-04-07 10:27:15 +00:00
60c121ebc2
Backport permissions and multi-line array to CE
2017-04-07 10:53:29 +01:00
9e89c93e16
Enable polling for pipelines table other pages
...
Also poll for pipeline changes on:
- Pipeline table on commit page
- Pipeline table on merge request page
- Pipeline table on new merge request page
2017-04-06 23:50:37 +02:00
751dae58e6
In case of Etag cache hit, the body should be empty
2017-04-06 23:50:36 +02:00
847b9c8232
Use Etag caching for pipelines json
...
Enable caching in the Etag::Middleware and when a pipeline changes
status, expire the cache for the project pipelines path.
2017-04-06 23:50:36 +02:00
8a5ca1121b
Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'
...
# Conflicts:
# spec/lib/gitlab/import_export/all_models.yml
2017-04-06 21:12:16 +00:00
55811ac990
Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags
2017-04-06 21:35:01 +01:00
792f6ed16f
Merge branch 'master' into new-resolvable-discussion
...
# Conflicts:
# app/assets/javascripts/filtered_search/dropdown_hint.js
# app/views/shared/issuable/_search_bar.html.haml
2017-04-06 15:00:26 -05:00
1815d44a7f
Merge branch '2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation' into 'master'
...
Resolve "Run CI/CD pipelines on a schedule" - "Basic backend implementation"
See merge request !10133
2017-04-06 18:55:34 +00:00
d6caa9d734
Merge branch 'feature/multi-level-container-registry-images' into 'master'
...
Multi-level container registry images
Closes #17801
See merge request !10109
2017-04-06 18:35:45 +00:00
173384f8a6
Merge branch 'gitaly-config-toml' into 'master'
...
Use config.toml to configure Gitaly
See merge request !10496
2017-04-06 17:51:22 +00:00
9362f59397
Merge commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971' into feature/multi-level-container-registry-images
...
* commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971': (28 commits)
Award emoji button smiley animation
Introduced empty/error UX states to environments monitoring.
Github import rake task
Remove individual modal width styles
Fix RuboCop for removing index
Link to docs site for file in doc/
Disable invalid service templates (again)
Show CI status as Favicon on Pipelines, Job and MR pages
STL file viewer
Wait for the PDF to be loaded before doing anything
remove unnecessary lease as cron job
Search for opened MRs - include reopened MRs
ProjectsFinder should handle more options
Clearly show who triggered the pipeline in email
Make it possible to preview pipeline success/failed emails
Add remove_concurrent_index to database helper
Add more tests for subgroups feature
Large features by the 1st, small ones by the 3rd
Ask people to create EE MRs on the 7th
fix project authorizations migration issue
...
2017-04-06 18:49:40 +02:00
2f7ff6eac5
Fix rubocop offence
2017-04-06 18:47:35 +02:00
828d81ee1f
Optimise trace handling code to use streaming instead of full read
2017-04-06 16:20:27 +00:00
5b6202cce1
Do not show play action if user not allowed to run it
2017-04-06 17:15:15 +02:00
fd82264391
Merge branch 'use-gitaly-find-ref-name' into 'master'
...
Use Gitaly for Environment#first_deployment_for
See merge request !10294
2017-04-06 15:14:29 +00:00
c3af43c3d2
Merge branch 'add-dimension-etag-caching-metrics' into 'master'
...
Include endpoint in metrics for ETag caching middleware
See merge request !10495
2017-04-06 15:00:12 +00:00
7d17fcea84
Fix projected import failing on missing relations
2017-04-06 15:48:20 +01:00
cb082ae291
Improve instantiate recursion in cron_parser.rb
2017-04-06 23:46:59 +09:00
31bd3962d7
Add empty line in cron_parser.rb
2017-04-06 23:46:59 +09:00
4688eb47c6
Rename cron_time_zone to cron_timezone. Separate add_concurrent_foreign_key.
2017-04-06 23:46:59 +09:00
0c153af73d
Ommit begin block in try_parse_cron
2017-04-06 23:46:59 +09:00
4949e2b291
Separate cron_valid? and cron_time_zone_valid?
2017-04-06 23:46:59 +09:00
3d3df09713
Dry up next_time_from. Move cron_parser_spec to appropriate location.
2017-04-06 23:46:59 +09:00
914bef671f
Move Ci::CronParser to Gitlab::Ci::CronParser
2017-04-06 23:46:58 +09:00
a67aff6d39
Add Import/Export Setting for trigger_schedule. Remove ref validation.
2017-04-06 23:46:58 +09:00
01cea0d59d
Suppress Import/Export function warnings. Add comment for confirmation.
2017-04-06 23:46:58 +09:00
9cee280d70
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion
2017-04-06 13:47:52 +01:00
894f01cd05
Include endpoint in metrics for ETag caching middleware
2017-04-06 14:46:55 +02:00
6185429495
Merge branch 'fix/gh-import-status-check' into 'master'
...
Periodically mark projects that are stuck in importing as failed
Closes #17709
See merge request !10207
2017-04-06 11:02:13 +00:00
dc20dd1b3d
Merge branch 'add_remove_concurrent_index_to_database_helper' into 'master'
...
Add remove_concurrent_index to database helper
Closes #30376
See merge request !10441
2017-04-06 10:54:09 +00:00
6d7a52480c
Merge branch 'master' into feature/multi-level-container-registry-images
...
* master: (94 commits)
Merge branch 'open-redirect-fix-continue-to' into 'security'
Merge branch 'open-redirect-host-fix' into 'security'
Merge branch 'path-disclosure-proj-import-export' into 'security'
Merge branch '29364-private-projects-mr-fix'
Merge branch '30125-markdown-security'
Issue title realtime
Update CHANGELOG.md for 8.16.9
Update CHANGELOG.md for 8.17.5
Update CHANGELOG.md for 9.0.4
Add "search" optional param and docs for V4
Use PDFLab to render PDFs in GitLab
Separate Scala from Java in CI examples
Fix broken link
Reorganize CI examples, add more links
Refactor CI index page
Remove deprecated field from workhorse response
Use gitlab-workhorse 1.4.3
Document how ETag caching middleware handles query parameters
Make group skip validation in the frontend
Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware
...
2017-04-06 12:24:46 +02:00
70982bb420
Hopefully this works
2017-04-06 12:10:03 +02:00
f16377e7dc
Protected Tags backend review changes
...
Added changelog
2017-04-06 10:56:21 +01:00
0fc361c4dc
Use Gitaly for Environment#first_deployment_for
2017-04-06 11:53:34 +02:00
18506d4b8b
Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'
...
# Conflicts:
# app/assets/javascripts/dispatcher.js
# app/assets/stylesheets/pages/projects.scss
2017-04-06 09:46:50 +00:00
1c783007e6
Issue title realtime
2017-04-06 01:13:06 +00:00
4e3de96ed0
Merge branch 'gitaly-prevent-autoload' into 'master'
...
Deal with Rails autoload instance variable resets
See merge request !10338
2017-04-05 23:32:16 +00:00
9997c58fc0
Add remove_concurrent_index to database helper
2017-04-06 09:53:57 +11:00
78a844217e
Merge branch 'workhorse-1.4.3' into 'master'
...
Workhorse 1.4.3
Closes gitaly#167 and gitaly#177
See merge request !10479
2017-04-05 21:33:35 +00:00
5c687e233b
Merge branch 'convert-poll-interval-to-string' into 'master'
...
Convert value to string before setting Poll-Interval header
See merge request !10477
2017-04-05 21:06:59 +00:00
ebdfda69bf
Merge branch 'gitaly-refs' into 'master'
...
Implement Gitaly refs client
See merge request !9291
2017-04-05 17:22:45 +00:00
afa53810de
Fix specs
2017-04-05 17:44:14 +01:00
bb8cc94668
Don't use original_discussion_id
2017-04-05 17:44:14 +01:00
79889a6aa3
Add specs
2017-04-05 17:44:14 +01:00
f6f6aaf593
Better notification emails for notes and (diff) discussions
2017-04-05 17:44:14 +01:00
08bbb9fce6
Add option to start a new discussion on an MR
2017-04-05 17:44:14 +01:00
5077079faa
Remove deprecated field from workhorse response
2017-04-05 16:29:56 +02:00
58371efbb0
Periodically mark projects that are stuck in importing as failed
...
Adds import jid to projects
Refactor middleware to set custom expiration time via sidekiq options
Add completed_jids option to sidekiq status and a few other changes
2017-04-05 16:11:51 +02:00
63a6453c01
Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware
...
NamespaceValidator::WILDCARD_ROUTES is less restrictive than
ProjectPathValidator::RESERVED and we really have to avoid only
routes that contain wildcard names.
2017-04-05 15:48:05 +02:00
35bafb3797
Convert value to string before setting Poll-Interval header
2017-04-05 15:35:05 +02:00
8eb350663e
Deal with Rails autoload instance variable resets
...
Rails auto-load (a development feature) can end up resetting instance
variables on classes. This breaks Gitlab::GitalyClient, which uses
instance variables to keep global hashes to look up channels and
addresses. This change adds code that regenerates the hashes if they
suddenly become nil.
2017-04-05 14:43:08 +02:00
54849afc6c
Handle SSH keys that have multiple spaces between each marker
...
Notice what happens when a user adds a key with a space in between:
```
irb(main):004:0> 'ssh-rsa foobar'.split(/ /)
=> ["ssh-rsa", "", "foobar"]
```
This would cause gitlab-shell to receive a blank argument for the actual
key, leading to users unable to login.
2017-04-04 23:12:08 -07:00
22d7ae8002
Fix issues importing forked projects
2017-04-04 16:34:19 +00:00
6c6eef939a
Merge branch '30400-fix-blob-highlighting-in-search' into 'master'
...
Fix blob highlighting in search
Closes #30400
See merge request !10420
2017-04-04 15:57:17 +00:00
20e3ed6093
Merge branch 'workhorse-gitaly-address' into 'master'
...
Pass GitalyAddress to workhorse
See merge request !10447
2017-04-04 15:48:24 +00:00
267cd3e359
Incorporate Gitaly client for refs service
2017-04-04 16:53:44 +02:00
ccca73d779
Merge branch 'master' into add-sentry-js-again-with-vue
2017-04-04 14:56:27 +01:00
ca94d20013
Pass GitalyAddress to workhorse
2017-04-04 15:41:50 +02:00
44321b1a3d
Merge branch 'master' into feature/multi-level-container-registry-images
...
* master: (57 commits)
Ensure we generate unique usernames otherwise validations fail
Fix a Knapsack issue that would load support/capybara.rb before support/env.rb
Ensure users have a short username otherwise a click event is triggered ...
Enable the `bullet_logger` setting; enable `raise` in test environment
Fix Rubocop offenses
Set the right timeout for Gitlab::Shell#fetch_remote
Refactoring Projects::ImportService
Move methods that are not related to mirroring to the repository model
Fix GitHub pull request formatter spec
Rename skip_metrics to imported on the importable concern
Add CHANGELOG
Remove unused include from RepositoryImportWorker
Skip MR metrics when importing projects from GitHub
Fetch GitHub project as a mirror to get all refs at once
Make file templates easy to use and discover
Ensure user has a unique username otherwise `user10` would match `user1`
Ensure the AbuseReport fixtures create unique reported users
Don't use FFaker in factories, use sequences instead
Fix brittle specs
Fix the AbuseReport seeder
...
Conflicts:
db/schema.rb
2017-04-04 13:36:36 +02:00
d56e422257
Disable support for Gitaly PostReceivePack
...
See https://gitlab.com/gitlab-org/gitaly/issues/172
2017-04-04 13:31:33 +02:00
d85471ac1a
Fixed UserAccess#can_create_tag? after create_access_levels rename
2017-04-04 03:50:15 +01:00
07d7d8e659
Renamed ProtectedTag push_access_levels to create_access_levels
2017-04-04 03:38:58 +01:00
3bb3a6886f
Attempt to fix import/export of push_access_levels for protected tags
2017-04-04 02:19:04 +01:00
1e15444ae6
Cleanup & tests for UserAccess#can_create_tag?
2017-04-04 02:05:42 +01:00
d5acb69e11
Protected Tags prevents all updates instead of just force pushes.
...
This only changes behaviour for masters, as developers are already prevented from updating/deleting tags without the Protected Tags feature
2017-04-04 00:10:14 +01:00
d9aca74115
Merge branch 'fix-github-importer-slowness' into 'master'
...
Improve performance of GitHub importer
Closes #28183
See merge request !10273
2017-04-03 21:26:41 +00:00
c2b35320e0
Merge branch 'namespace-race-condition' into 'master'
...
Fix race condition in namespace directory creation
See merge request !10268
2017-04-03 20:44:24 +00:00
e98536fb38
Merge branch 'feature/support-grpc-calls-over-tcp-conn' into 'master'
...
Add support for Gitaly calls over TCP connection
Closes gitaly#166
See merge request !10410
2017-04-03 20:08:28 +00:00
103a2a9ab9
Merge branch 'feature/add-feature-flags-for-upload-receive-pack' into 'master'
...
Add feature flags for enabling (Upload|Receive)Pack
Closes gitaly#168
See merge request !10341
2017-04-03 20:05:15 +00:00
ff9eb3042f
Set the right timeout for Gitlab::Shell#fetch_remote
2017-04-03 16:36:14 -03:00
9f4b8dba80
Clean up non TODO rubocop errors
2017-04-03 20:06:06 +01:00
a6affc66dc
Rename skip_metrics to imported on the importable concern
2017-04-03 15:50:22 -03:00
20486593bd
Skip MR metrics when importing projects from GitHub
2017-04-03 15:50:22 -03:00
336ba94a7b
Fetch GitHub project as a mirror to get all refs at once
2017-04-03 15:50:22 -03:00
bf3cc824e4
Moved Project#protected_branch? to ProtectedBranch, similar for tags
2017-04-03 19:19:54 +01:00
7f32ad7097
Fix blob highlighting in search
2017-04-03 18:51:44 +01:00
ca6a7f1e9c
Merge branch 'style-proc-cop' into 'master'
...
Enable Style/Proc cop for rubocop
See merge request !10382
2017-04-03 16:47:18 +00:00
09751c75eb
Add support for Gitaly calls over TCP connection
...
Closes gitaly#166
2017-04-03 18:45:36 +02:00
39753bfb9c
Add feature flags for enabling (Upload|Receive)Pack for Gitaly
...
Closes gitaly#168
2017-04-03 18:44:57 +02:00
65f3d5062f
Extract ProtectedRef Concern
2017-04-03 17:19:53 +01:00
b2700e64cc
Merge branch '22303-symbolic-in-tree' into 'master'
...
#22303 fix mode representation git::tree ( in base 8 )
Closes #22303
See merge request !9780
2017-04-03 15:59:24 +00:00
872b3215d2
Merge branch 'introduce-base-polling-interval' into 'master'
...
Introduce "polling_interval_multiplier" as application setting
Closes #29759
See merge request !10280
2017-04-03 14:51:37 +00:00
b23b76d8eb
Merge branch 'workhorse-gitaly-repository' into 'master'
...
Pass Gitaly 'Repository' messages to workhorse for Git HTTP
Closes gitaly#148
See merge request !10343
2017-04-03 14:40:17 +00:00
059e11d87f
Fix race condition in namespace directory creation
2017-04-03 09:35:12 -04:00
9543025e88
Introduce "polling_interval_multiplier" as application setting
...
Implement module for setting "Poll-Interval" response header.
Return 429 in ETag caching middleware when polling is disabled.
2017-04-03 15:17:04 +02:00
13487809c7
Pass Gitaly Repository messages to workhorse
2017-04-03 13:58:29 +02:00
3c75ee2823
Minor refactor
2017-04-03 12:45:31 +02:00
c8273ba858
Fix BrachFormatter for removed users
2017-04-03 12:45:31 +02:00
291bd873d3
One more change to the branch names to preserve metadata
2017-04-03 12:45:31 +02:00
59588ebac0
Prefixes source branch name with short SHA to avoid collision
2017-04-03 12:45:31 +02:00
a3e65ef021
Fix GitHub importer for PRs of deleted forked repositories
2017-04-03 12:45:31 +02:00
1a47986b3d
Check registry repository name against regexp
...
This regexp is extracted from Docker Distribution 2.4.1 docs, contains
additional `/` element that can be a separator of components.
2017-04-03 11:38:39 +02:00
e7e9307219
Merge branch 'use-gitaly-commit-is-ancestor' into 'master'
...
Use gitaly commit is ancestor
See merge request !9864
2017-04-02 17:36:25 +00:00
ed5d59d4c4
Fix symlink icon in project tree
2017-04-02 14:42:37 +03:00
0a09925dce
Enable Style/Proc cop for rubocop
2017-04-02 12:48:43 +03:00
553cf9ea54
Added ‘protected’ label and disabled delete button for tags index/show
2017-03-31 19:37:39 +01:00
e3fbcd0093
Protected Tags enforced over git
2017-03-31 19:37:38 +01:00
bf0590b3e2
Merge branch 'allow-multiple-paths-in-repository-log' into 'master'
...
Support >1 path in Gitlab::Git::Repository#log
See merge request !10291
2017-03-30 14:56:43 +00:00
1ea0ce827a
Make GitLab use Gitaly for commit_is_ancestor
...
- Migration in Repository#is_ancestor?
2017-03-30 16:06:31 +02:00
53819c5ac6
Support >1 path in Gitlab::Git::Repository#log
...
This is analogous to `git log -- foo bar baz`, but not the same as
`Gitlab::Git::Repository#log(path: 'foo bar baz')`, which would run `git
log -- 'foo bar baz'`.
2017-03-30 10:21:19 +01:00
60c0c0f3d0
Merge branch '29843-project-subgroup-transfer' into 'security'
...
Use full path for moving directories when changing namespace path
See merge request !2078
2017-03-29 19:16:50 -07:00
4d9cc94170
Merge branch 'gitaly-socket-per-shard' into 'master'
...
One Gitaly connection per storage shard
See merge request !10150
2017-03-29 15:46:11 +00:00
1904c80f3d
Change socket_path to gitaly_address
2017-03-29 14:48:05 +02:00
8f50ef5e75
Separate GRPC channels per repository storage
2017-03-29 14:48:05 +02:00
c837da3439
Helper method for storage path stripping
2017-03-29 14:48:04 +02:00
6dd7695444
Labels support color names in backend
2017-03-29 11:45:15 +00:00
91e150266a
Use Rugged::SORT_NONE instead of Rugged::SORT_DATE
...
Meaning of SORT_DATE was changed in libgit2.
See 82d4c0e6b8
2017-03-28 14:19:52 +02:00
e396b43771
Remove unused method Gitlab::Git::Repository#commits_since
2017-03-28 14:19:52 +02:00
1dbd80d190
Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-28 09:26:47 +02:00
8391fa37f0
Merge branch '12818-expose-simple-cicd-status-endpoints-with-status-serializer-gitlab-ci-status-for-pipeline-job-and-merge-request' into 'master'
...
Expose CI/CD status API endpoints with Gitlab::Ci::Status facility on pipeline, job and merge request for favicon
See merge request !9561
2017-03-27 12:21:22 +00:00
7c74a0209b
Implement new service for creating user
2017-03-27 09:37:24 +00:00
d561881b13
Merge branch 'improve-ee_check_compat-again' into 'master'
...
Fetch deeper the tested branch before fetching master
See merge request !9484
2017-03-24 11:45:13 +00:00
60e54a6271
Merge branch 'fix-ci-api-regression-for-after-script' into 'master'
...
Fix after_script processing for Runners APIv4
See merge request !10185
2017-03-24 09:03:11 +00:00
98b87a6ebf
Put banners in constants
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-23 23:30:27 +01:00
8720f1d634
Fetch deeper the tested branch before fetching master
...
The tested branch is clone with a deep of 20 so if it has more than 20
commits, we need to deepen its hitory to be able to find the merge-base
with origin/master.
Also, detect prefixed EE branch as well, i.e. `ee-<branch>`.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-23 23:30:27 +01:00
3878a774f1
Fix after_script processing for Runners APIv4
2017-03-23 16:10:06 +01:00
01a8615aa0
Merge branch 'increase-etag-cache-expiry-time' into 'master'
...
Increase ETag cache expiry time
See merge request !10180
2017-03-23 13:43:58 +00:00
e946bbe1eb
Increase ETag cache expiry time
...
As discussed in #29777 .
2017-03-23 12:23:13 +01:00
448c695c2a
Revert adding favicon to extended statuses. Change extended statues specs to use core status
2017-03-23 17:11:49 +09:00
74f13e0ddf
Fix unchanged structure. Add favicon for 'failed_allowed' and 'success_warning' because it'll be used.
2017-03-23 17:11:49 +09:00
49f9ab9064
Add spec for spec/lib/gitlab/ci/status
2017-03-23 17:11:49 +09:00
21e62c9ef9
Roolback unneccesary changes
2017-03-23 17:11:49 +09:00
04b1741cd1
Remove def favicon from extended status
2017-03-23 17:11:48 +09:00
6d6127f665
change favicon name
2017-03-23 17:11:48 +09:00
ba27f1b954
Expose only status. ci_cd_status to status. Support abstract class.
2017-03-23 17:11:48 +09:00
0e06cfc059
Add api points for ci cd status. Add favicon.
2017-03-23 17:11:48 +09:00
645a55f19b
Introduce a new middleware for the test environment that can block requests
...
The idea is that after each feature spec example, we block all incoming
requests at the Rack level, go to the 'about:blank' page, and wait until
the current requests reach 0.
This should solve the problem where a request would end after database
cleaner performed the database truncation. The problem was that a GET
request can still lead to records creation (e.g. namespaces or routes).
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-22 19:45:21 +01:00
3883a5f906
Rake task that can install gitaly at a tag version
2017-03-21 14:55:41 +01:00
4146be0448
Merge branch '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-cloning-project-wikis' into 'master'
...
Fix ProjectWiki#http_url_to_repo signature
Closes #29685
See merge request !10079
2017-03-21 10:39:57 +00:00
f592cae129
Merge branch 'sh-fix-admin-application-settings' into 'master'
...
Fix Error 500 when application settings are saved
Closes #29674 and #29115
See merge request !10070
2017-03-21 07:21:01 +00:00
83a0c39808
Merge branch 'ssrf' into 'security'
...
nil check for url_blocker?
See merge request !2076
2017-03-20 18:53:45 -07:00
65aafb9917
Merge branch 'ssrf' into 'security'
...
Protect server against SSRF in project import URLs
See merge request !2068
2017-03-20 18:53:04 -07:00
71306f14f6
Make level_value accept string integers
...
When a VisibilityLevel is an integer formatted as a string, convert it
to an integer, instead of looking it up in the hash map.
When the value is not recognized, default to PRIVATE.
2017-03-20 22:53:29 +01:00
be25bbc4d2
Fix ProjectWiki#http_url_to_repo signature
...
New Gitlab::UrlSanitizer.http_credentials_for_user method responsible
for generating a credentials hash from a user.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-20 16:24:01 +01:00
12dd5ac221
All CI offline migrations
2017-03-17 23:06:11 +00:00
bbddd77086
Merge branch 'database-config-method' into 'master'
...
Added Gitlab::Database.config
See merge request !10045
2017-03-17 17:52:46 +00:00
5409a3c5b7
Merge branch 'feature/use-gitaly-for-commit-show' into 'master'
...
Use Gitaly for CommitController#show
See merge request !9629
2017-03-17 17:41:44 +00:00
9a20ff1c99
Added Gitlab::Database.config
...
This returns the ActiveRecord configuration for the current environment.
While CE doesn't use this very often, EE will use it in a few places for
the database load balancing code. I'm adding this to CE so we don't end
up with merge conflicts in this file.
2017-03-17 17:08:10 +01:00
d68c23a00e
Merge branch '26470-branch-names-with-reference-prefixes-results-in-buggy-branches' into 'master'
...
Strip reference prefixes on branch creation
Closes #26470
See merge request !8498
2017-03-17 12:02:50 +00:00
ac8beca423
Merge branch '29565-name-of-the-uncompressed-folder-of-a-tag-archive-changed' into 'master'
...
Fix archive prefix bug for refs containing dots
Closes #29565
See merge request !10007
2017-03-16 18:22:14 +00:00
4597654079
Fix archive prefix bug for refs containing dots
2017-03-16 21:04:58 +05:30
b196ee31d7
This quick-fixes an issue with existing award emoji not being valid anymore
...
Gitlab::Emoji#gl_emoji_tag now returns early instead of raising a 500 error.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-16 14:36:04 +01:00
111e868439
Merge branch 'dm-fix-mailroom-config' into 'master'
...
Fix reply by email by fixing config/mail_room.yml to be interpretable without ActiveSupport
See merge request !9979
2017-03-16 00:44:09 +00:00
e5ac06447e
Fix config/mail_room.yml to be interpretable Ruby
2017-03-15 16:21:55 -06:00
4eb24c3161
Verify config/mail_room.yml is interpretable Ruby
2017-03-15 16:21:45 -06:00
ef447a6263
Merge branch 'dm-copy-code-as-gfm' into 'master'
...
Copy code as GFM from diffs, blobs and GFM code blocks
See merge request !9874
2017-03-15 16:26:34 +00:00
0ace54e8bd
Merge branch 'allow-resolving-conflicts-in-utf-8' into 'master'
...
Allow resolving conflicts with non-ASCII chars
Closes #26214
See merge request !9937
2017-03-15 14:57:57 +00:00
96c77bf775
Allow resolving conflicts with non-ASCII chars
...
We wanted to check that the text could be encoded as JSON, because
conflict resolutions are passed back and forth in that format, so the
file itself must be UTF-8. However, all strings from the repository come
back without an encoding from Rugged, making them ASCII_8BIT.
We force to UTF-8, and reject if it's invalid. This still leaves the
problem of a file that 'looks like' UTF-8 (contains valid UTF-8 byte
sequences), but isn't. However:
1. If the conflicts contain the problem bytes, the user will see that
the file isn't displayed correctly.
2. If the problem bytes are outside of the conflict area, then we will
write back the same bytes when we resolve the conflicts, even though
we though the encoding was UTF-8.
2017-03-15 11:18:29 +00:00
c0a4f527db
Use Gitaly for CommitController#show
2017-03-15 12:52:11 +02:00
6890327762
Copy code as GFM from diffs, blobs and GFM code blocks
2017-03-14 15:29:00 -06:00
ffcddb2959
Merge branch '28864-use-the-v4-api-from-the-frontend' into 'master'
...
Resolve "Use the v4 API from the frontend"
Closes #28864
See merge request !9714
2017-03-14 15:57:01 +00:00
bdc1a55ede
Merge branch '29389-fix-already-initialized-constants' into 'master'
...
Remove explicit `require` calls, and use `require_dependency` when needed
Closes #29389
See merge request !9899
2017-03-14 15:07:51 +00:00
181c2582fb
Merge branch 'nonewline-parser' into 'master'
...
Take nonewline context into account in diff parser
Closes #28128 and #22636
See merge request !9705
2017-03-14 13:16:26 +00:00
435458d2b1
Update API on frontend to use v4
...
Use options object to pass params for project endpoint
2017-03-14 06:58:20 -04:00
985af1a670
take nonewline context into account in diff parser
2017-03-13 22:09:43 +02:00
c5e34da01d
Remove explicit `require` calls, and use `require_dependency` when needed
...
See
http://guides.rubyonrails.org/autoloading_and_reloading_constants.html
for more info.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-13 14:29:55 +01:00
47270e1cfd
Backport changes from gitlab-org/gitlab-ee!1406
2017-03-13 12:31:27 +01:00
d1df36e386
Merge branch 'refactor/global-permissions-for-internal-users' into 'master'
...
Refactor/global permissions for internal users
See merge request !9598
2017-03-13 11:04:33 +00:00
a996880bf7
Using guard clause and added more specs
2017-03-10 21:13:45 +01:00
9b53cb6c88
Fix GitHub Import for open PRs from a fork
2017-03-10 21:08:21 +01:00
c4ba6ea684
Merge branch 'fix-500-in-notes-polling' into 'master'
...
Fix notes polling failing after code changes
Closes #29327
See merge request !9862
2017-03-10 18:54:32 +00:00
394d83ff17
Fix notes polling failing after code changes
...
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9235
2017-03-10 15:41:26 +00:00
c92808ed32
Fix for creating a project through API when import_url is nil
...
The API was returning 500 when `nil` is passed for the `import_url`.
In fact, it was `Gitlab::UrlSanitizer.valid?` which was throwing a
`NoMethodError` when `nil` value was passed.
2017-03-10 10:03:03 +01:00
90d924dc39
reverse the logic and use a clearer name
2017-03-09 13:59:19 -08:00
145f6fd0b9
protect git access through the policy infra
2017-03-09 11:49:52 -08:00
846e581732
use a magic default :global symbol instead of nil
...
to make sure we mean the global permissions
2017-03-09 11:49:52 -08:00
ca66799267
Merge branch 'dz-nested-groups-members' into 'master'
...
Show members of parent groups on project members page
Closes #28786 and #27962
See merge request !9764
2017-03-09 13:54:43 +00:00
5b52adcedb
Fix group members method for project import/export
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-03-09 13:40:57 +02:00
1dc2e185b8
Merge branch 'feature/gb/verbosify-blocked-pipeline-status' into 'master'
...
Verbosify blocked pipeline status description
Closes #29134
See merge request !9800
2017-03-09 10:20:00 +00:00
ce35dcbc81
Refactor some code
2017-03-08 19:42:21 +01:00
26fa716dd2
Fix name colision when importing GitHub pull requests from forked repositories
2017-03-08 19:42:21 +01:00
3403bdc5f2
Fix reference to node_modules in built package
...
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29192
See https://gitlab.slack.com/archives/frontend/p1488973548024005
2017-03-08 10:41:16 -06:00
b51e4cb358
Merge branch 'fix/29093' into 'master'
...
Fix 'Object not found - no match for id (sha)' when importing GitHub PRs
Closes #29093
See merge request !9751
2017-03-08 12:56:17 +00:00
7319460c18
Verbosify blocked pipeline status description
2017-03-08 09:10:20 +01:00
e53fa9605a
Merge branch 'dm-nested-groups-go-get' into 'master'
...
Fix go-get support for projects in nested groups
See merge request !9793
2017-03-08 03:20:04 +00:00
d13451cd49
Returns correct header data for commits endpoint
2017-03-07 22:56:31 -03:00
c46f933bb7
Fix pagination headers for repository commits api endpoint
2017-03-07 22:56:31 -03:00
359f04e8a1
Fix go-get support for projects in nested groups
2017-03-07 19:40:19 -06:00
ec4b03a4c6
Fix 'Object not found - no match for id (sha)' when importing GitHub PRs
2017-03-07 15:59:07 -03:00
55f2a5debc
Added Prometheus Service and Prometheus graphs
2017-03-07 16:57:42 +00:00
de37dcee90
Merge branch 'siemens/gitlab-ce-feature/openid-connect'
2017-03-07 16:16:08 +00:00
6a52cda31d
Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonation_token'
2017-03-07 09:29:55 -06:00
8699c8338f
Require explicit scopes on personal access tokens
...
Gitlab::Auth and API::APIGuard already check for at least one valid
scope on personal access tokens, so if the scopes are empty the token
will always fail validation.
2017-03-07 15:00:29 +01:00
eefbc83730
Only use API scopes for personal access tokens
2017-03-07 15:00:29 +01:00
93daeee164
Don't allow blocked users to authenticate through other means
...
Gitlab::Auth.find_with_user_password is currently used in these places:
- resource_owner_from_credentials in config/initializers/doorkeeper.rb,
which is used for the OAuth Resource Owner Password Credentials flow
- the /session API call in lib/api/session.rb, which is used to reveal
the user's current authentication_token
In both cases users should only be authenticated if they're in the
active state.
2017-03-07 15:00:29 +01:00
c498289048
Implement OpenID Connect identity provider
2017-03-07 14:54:35 +01:00
fb4a486605
Merge branch 'feature/runner-jobs-v4-api' into 'master'
...
Feature/runner jobs v4 api
Closes #28513
See merge request !9273
2017-03-07 13:53:26 +00:00
32b09b8847
Add minor refactoring
2017-03-07 12:30:34 +01:00
fb167787f2
Merge remote-tracking branch 'upstream/master' into set-default-cache-key-for-jobs
...
* upstream/master: (289 commits)
re-add Assign to Me link on new MR/Issue forms
thinner bottom header border
make header match old 16px padding of body contents
Update font-awesome-rails to 4.7.0.1
Relax font-awesome-rails dependency to ~> 4.7
Restore keyboard shortcuts for "Activity" and "Charts"
fix border radius bottom for header
match padding for mr-widget sections
Update changelog
Fix project-last-commit alignment
Docs: update GL Pages IP on GL.com
Fix up @DouweM review
Remove readme-only project view preference
Add `uploads` to known models for Import/Export spec
Add `has_many` associations for models that can have Upload records
Handle relative and absolute Upload paths in the Uploaders
Change the default CarrierWave root path for tests
Fix Projects::UploadService spec
Add a Project::UploadsController spec to ensure an Upload is created
Add `RecordsUploads` module to record Upload records via callbacks
...
2017-03-07 16:55:03 +08:00
6b2d4947a6
Merge branch '23948-assign-to-me' into 'master'
...
re-add Assign to Me link on new MR/Issue forms
Closes #23948
See merge request !9499
2017-03-07 07:08:38 +00:00
4f143aa8f2
re-add Assign to Me link on new MR/Issue forms
2017-03-07 16:23:52 +11:00
0ec62b6c5d
Merge branch '26371-native-emojis-v3' into 'master'
...
Add emoji images - Base Native Unicode Emojis
Closes #26371
See merge request !9569
2017-03-07 02:34:48 +00:00
ef24c9ef77
Merge branch 'use-publish-to-post-notifications' into 'master'
...
Use publish channel to post notifications changes
See merge request !9574
2017-03-07 00:39:56 +00:00
96cbad2337
Fix up @DouweM review
2017-03-06 15:19:33 -06:00
005749a616
apply codestyle and implementation changes to the respective feature code
2017-03-06 19:18:26 +00:00
79b8f02bb1
Merge branch 'pipeline-blocking-actions' into 'master'
...
Make manual actions blocking
Closes #26360 and #22628
See merge request !9585
2017-03-06 19:16:01 +00:00
f602efea65
Fix wrong image src with cached gl-emoji and relative root
2017-03-06 12:54:46 -06:00
e6fc0207cb
Use native unicode emojis
...
- gl_emoji for falling back to image/css-sprite when the browser
doesn't support an emoji
- Markdown rendering (Banzai filter)
- Autocomplete
- Award emoji menu
- Perceived perf
- Immediate response because we now build client-side
- Update `digests.json` generation in gemojione rake task to be more
useful and include `unicodeVersion`
MR: !9437
See issues
- #26371
- #27250
- #22474
2017-03-06 12:54:46 -06:00
a4dd579261
Merge branch '27520-option-to-prevent-signing-in-from-multiple-ips' into 'master'
...
GitLab should have an option to prevent users from signing in from multiple IPs
Closes #27520
See merge request !8998
2017-03-06 16:22:46 +00:00
0a58a8c825
Merge branch 'gitlab-database-fix' into 'master'
...
removes redundant code from gitlab database file
See merge request !9282
2017-03-06 16:13:11 +00:00
70b9d8da4c
Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers
2017-03-06 15:45:43 +01:00
8a9bc24ef8
align schema.rb with upstream and fix rubocop warning about not freezing mutable constants and empty error classes
2017-03-06 15:41:50 +01:00
0ef8a64348
Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR review
...
- cleanup formating in haml
- clarify time window is in seconds
- cleanup straneous chunks in db/schema
- rename count_uniqe_ips to update_and_return_ips_count
- other
2017-03-06 15:41:25 +01:00
9cc0ff8f46
Cleanup common code in Unique Ips tests
2017-03-06 15:41:25 +01:00
8993801f0c
Test various login scenarios if the limit gets enforced
2017-03-06 15:41:25 +01:00
66dc71599c
Cleanup formatting
2017-03-06 15:41:24 +01:00
e5cf3f51fb
Allow limiting logging in users from too many different IPs.
2017-03-06 15:41:24 +01:00
07539ab2b0
Merge branch 'master' into pipeline-blocking-actions
...
* master: (26 commits)
Fix UserBasic
Rename `/take` to `/take_ownership`, expose `owner` in `v3`.
Update after review
Fix values being called at Array instead of Hash
Fix json response in branches controller
Improve docs and specs related to pages artifacts
Add MR fo changelog about removing pages artifacts
Delete artifacts for pages unless expiry date is specified
Lint doc
Improved team selection
Move foreign key to separate migration
Fix import model attributes
Update documentation and expose ID
Introduce tests for pipeline triggers
Fix trigger model
Update db/schema
Make triggers to be user aware
Make Pipeline Triggers to be user aware
Update triggers API
Remove remnants of git annex
...
Conflicts:
db/schema.rb
2017-03-06 15:11:28 +01:00
bb2460c1ea
Improve specs for detailed statuses with manual actions
2017-03-06 14:08:55 +01:00
66dd209661
Ignore job by default if it is a manual action
...
This makes it possible to maintain backwards compatibility with configs
created when manual actions were non-blocking.
From now manual actions are blocking if configured with `allow_failure:
false`, otherwise manual actions are optional, and their status is
ignored.
2017-03-06 12:01:33 +01:00
2d652fcf5a
Update notification code
2017-03-06 11:44:45 +01:00
633aaf2b61
Merge branch 'etag-notes-polling' into 'master'
...
Use ETag to improve performance of issue notes polling
Closes #27582
See merge request !9036
2017-03-06 10:42:08 +00:00
ac5bd3b73c
Reinstitute a core `manual` status for manual actions
2017-03-06 10:04:04 +01:00
14351f9767
Introduce core status for blocked manual actions
2017-03-06 10:04:04 +01:00
79ea01bfaf
Refactor code related to pipeline blocking actions
2017-03-06 10:04:04 +01:00
be039d22d7
Make manual actions blocking
2017-03-06 10:04:04 +01:00
ffd970d97d
Make SidekiqStatus able to count number of jobs completed/running
2017-03-03 15:35:58 -08:00
0fe0b044e4
No need to set cache:key if no path was specified
...
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666/diffs#note_24607518
2017-03-03 22:21:46 +08:00
3f5191de6d
Add specs for notifications
2017-03-03 13:51:49 +01:00
2b27a98db3
Add support for Workhorse notifications
2017-03-03 12:57:47 +01:00
a00520b15d
Restore Unspecified and we could discuss later
...
Also feedback in:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666/diffs#note_24608283
2017-03-03 16:55:01 +08:00
a0ab45d0c3
Fix the `Gitlab::Seeder` monkey patch to disable mail delivery
2017-03-02 20:29:30 -05:00
53760bb836
removes redundant code from gitlab database file
2017-03-02 20:29:32 +00:00
8ec8b2da66
Merge branch '27501-api-use-visibility-everywhere' into 'master'
...
API: Use `visibility` as string parameter everywhere
Closes #27501
See merge request !9337
2017-03-02 17:10:25 +00:00
5c1aa5fb65
Add some fixes and refactoring after review
2017-03-02 17:48:00 +01:00
1bbf2c2cd1
Fix rubocop offenses
2017-03-02 17:45:46 +01:00
fb8210ad19
Update step data naming
2017-03-02 17:45:45 +01:00
bbf5bb7070
Fix rubocop offenses
2017-03-02 17:45:45 +01:00
3eafffcef0
Refactor JobRequest response structure
2017-03-02 17:45:45 +01:00
dc3a41f405
Fix tests for added default cache key
2017-03-03 00:30:22 +08:00
6e032d7ba0
Set default cache key for jobs, detail:
...
* Replace Unspecified with a field so that it's less surprising
* Define inspect for Node for easy debugging (and avoid building
a very huge string potentially from built-in inspect)
* Set default cache key to 'default'
2017-03-02 22:12:15 +08:00
a3fdd6acd2
Use string based `visibility` getter & setter
...
Add `visibility` & `visibility=` methods to the
`Gitlab::VisibilityLevel` module so the `visibility_level` can be
get/set with a string value.
2017-03-02 12:15:25 +01:00
d415419532
Merge branch '28805-download-archive-with-branch-like-feature-xxxx-add-extra-directory-level' into 'master'
...
Ensure archive download is only one directory deep
Closes #28805
See merge request !9616
2017-03-02 08:37:07 +00:00
fc28719145
A VisibilityLevel also can be presented as string
...
For the API, the VisibilityLevel will be exposed as String instead of
Integer. So add the string values and method to translate a level
integer to a string.
2017-03-02 09:28:41 +01:00
3ac54d22b9
Ensure archive download is only one directory deep
2017-03-02 10:30:24 +05:30
f8fa6e6f47
Add internal endpoint to notify post-receive to Gitaly
2017-03-01 18:46:59 -03:00
981c730fdb
Merge branch 'custom-empty-exception-class-cop' into 'master'
...
Add RuboCop cop for custom error classes
Closes #28770
See merge request !9573
2017-03-01 17:32:32 +00:00
61c9604721
Add middleware for ETag caching with Redis
2017-03-01 16:48:01 +01:00
811e598f60
Enable and autocorrect the CustomErrorClass cop
2017-03-01 15:28:10 +00:00
2b474dc2b2
refactors finder and correlated code
2017-03-01 13:11:11 +00:00
5a4ad9abce
Make JS use API v3 because v4 is not frozen yet
2017-03-01 12:57:50 +02:00
9f2e4742e3
applies relevant changes to the code and code structure
2017-02-28 22:15:40 +00:00
a3dfb58e7f
add impersonation token
2017-02-28 22:15:39 +00:00
5cd79bd641
Merge branch 'fix-webpack-dev-server-proxy' into 'master'
...
Fix broken dev environment in master
See merge request !9557
2017-02-27 18:25:41 +00:00
780e3e976d
fix missing @ symbol
2017-02-27 12:20:00 -06:00
34685c588a
Merge branch 'fix-webpack-dev-server-proxy' into 'master'
...
Fix webpack dev server when behind proxy
See merge request !9543
2017-02-27 17:31:36 +00:00
Jacob Vosmaer
Paweł Chojnacki
Felipe Artur
Toon Claes
Kushal Pandya
James Edwards-Jones
Douwe Maan
Kamil Trzciński
Sean McGivern
Grzegorz Bizon
Shinya Maeda
Luke "Jared" Bennett
Adam Niedzielski
Yorick Peterse
Kim "BKC" Carlbäcker
Regis Boudinot
Rémy Coutable
blackst0ne
Robert Speicher
James Lopez
Stan Hu
James Lopez
Alejandro Rodríguez
Ahmad Sherif
Douwe Maan
Douglas Barbosa Alexandre
Nick Thomas
Robin Bobbitt
Gabriel Mazetto
mhasbini
Sean McGivern
Rémy Coutable
Dongqing Hu
George Andrinopoulos
Tomasz Maczukin
Rubén Dávila
Mark Fletcher
DJ Mountney
Sam Rose
http://jneen.net/
Dmitriy Zaporozhets
Eric Eastwood
Oswaldo Ferreira
Markus Koller
Lin Jen-Shin
Alfredo Sumaran
Simon Knox
Filipa Lacerda
Tiago Botelho
Robert Speicher
Valery Sizov
Simon Vocella
Mike Greiling