Commit Graph

58911 Commits

Author SHA1 Message Date
Gabriel Mazetto fff5ebdcae Removed some useless code, codestyle changes and removed an index 2017-08-22 06:33:20 +02:00
Gabriel Mazetto 95a270c871 Fix repository reloading in some specs 2017-08-22 06:33:20 +02:00
Gabriel Mazetto 47d3ea01bb Changelog 2017-08-22 06:33:20 +02:00
Gabriel Mazetto e7a060321f Moving away from the "extend" based factory to a more traditional one.
Using `extend` dynamically can lead to bad performance as it
invalidates the method's cache.
2017-08-22 06:33:20 +02:00
Gabriel Mazetto 72250a4ed8 Enable automatic hashed storage for new projects by application settings 2017-08-22 06:33:20 +02:00
Gabriel Mazetto 9e6fa996ea New storage is now "Hashed" instead of "UUID" 2017-08-22 06:33:20 +02:00
Gabriel Mazetto 5340339957 Add UUID Storage to Project 2017-08-22 06:33:20 +02:00
Gabriel Mazetto 950c87308a Move create_repository back to project model as we can use disk_path and share it 2017-08-22 06:33:20 +02:00
Gabriel Mazetto cdafffcf15 Codestyle: move hooks to the same place and move dependent methods to private 2017-08-22 06:33:20 +02:00
Robert Speicher 539ed0a637 Merge branch 'gitaly-tree-entries-encoding' into 'master'
Correctly encode string params for Gitaly's TreeEntries RPC

Closes #36720

See merge request !13724
2017-08-21 22:22:37 +00:00
Clement Ho ce57827268 Merge branch '36298-use-non-i18n-values-for-setting-new-group-level-issue-mr-button-text' into 'master'
Use non-i18n values for setting new group-level issue/MR button text

Closes #36298

See merge request !13570
2017-08-21 21:29:10 +00:00
Bryce Johnson 4add91b6e1 Use non-i18n values for setting new group-level issue/MR button text 2017-08-21 21:29:09 +00:00
Marcia Ramos 2db755b33d Merge branch '36533-add-docs-for-group-issues-page-and-group-merge-requests-page' into 'master'
Add docs for group issues page and group merge requests page

Closes #36533

See merge request !13678
2017-08-21 20:44:36 +00:00
Robert Speicher 367d3d9704 Merge branch 'only-limit-fetch-when-requested' into 'master'
Only require sidekiq-limit_fetch when enabled in settings

Closes #36253

See merge request !13715
2017-08-21 19:26:12 +00:00
Marcia Ramos 4b142701cc indexes external issue tracker 2017-08-21 16:05:11 -03:00
Marcia Ramos 2eb07aecc9 copyedit 2017-08-21 16:04:52 -03:00
Marcia Ramos 905caab81a indexes user/search/ from /user/index 2017-08-21 15:34:52 -03:00
Alejandro Rodríguez b7ebb447d7 Correctly encode string params for Gitaly's TreeEntries RPC 2017-08-21 15:13:40 -03:00
Sean McGivern 646aae3e4f Merge branch 'sh-fix-atom-feeds' into 'master'
Fix 500 errors in Atom feeds due to push events

Closes #36705

See merge request !13695
2017-08-21 14:34:21 +00:00
Clement Ho 9316bb2b4c Merge branch 'winh-projects-select-dropdown' into 'master'
Make project selection dropdown consistent

See merge request !13562
2017-08-21 14:26:04 +00:00
Victor Wu 71b89a8744 Wording 2017-08-21 14:25:07 +00:00
Victor Wu 9b15d8e8eb Cross link to groups docs 2017-08-21 14:19:48 +00:00
Victor Wu f83392e17c Issue tracker 2017-08-21 14:08:43 +00:00
Sean McGivern c26bc5097f Make RuboCop happy 2017-08-21 14:30:37 +01:00
Stan Hu 4bfdf8406f Fix Error 500s when viewing user or group Atom feeds 2017-08-21 14:09:52 +02:00
Kamil Trzciński 6017e3b90d Merge branch 'fix/gb/fix-head-pipeline-when-pipeline-has-errors' into 'master'
Fix merge request head pipeline when pipeline has errors

Closes #36657

See merge request !13664
2017-08-21 11:58:41 +00:00
Sean McGivern 0db5f576fe Only require sidekiq-limit_fetch when enabled in settings
This gem allows Sidekiq jobs to be throttled. Unfortunately, it has a
side-effect: when we haven't enabled job throttling, it will still hit Redis a
lot (and miss, because nothing is configured).

As this setting already required a restart, ensure that the library is only
required when it's enabled.
2017-08-21 12:56:22 +01:00
Kamil Trzciński e00e62c2c8 Merge branch 'backstage/gb/migrate-stages-statuses' into 'master'
Migrate CI/CD stages statuses

Closes #33453

See merge request !12584
2017-08-21 11:47:44 +00:00
Douwe Maan d6547ce0e7 Merge branch 'gitaly-annotations-update' into 'master'
Gitlab::Git deletions and simplifications

See merge request !13640
2017-08-21 11:45:35 +00:00
Douwe Maan 0a6c3f3896 Merge branch 'gitaly-0.33.0' into 'master'
Use Gitaly 0.33.0

See merge request !13671
2017-08-21 11:45:27 +00:00
Kamil Trzciński 48404ada9c Merge branch 'zj-remove-ci-api-v1' into 'master'
Remove CI API v1

See merge request !13652
2017-08-21 11:44:30 +00:00
Kamil Trzciński 0fa4e2ff97 Merge branch 'fix/sm/34805-get-back-validates-uniqueness-1' into 'master'
Add `validates :key, uniqueness: { scope: :pipeline_schedule_id }` in `Ci::PipelineScheduleVariable` model

See merge request !13641
2017-08-21 11:43:10 +00:00
Sean McGivern fa293df2b7 Merge branch '35343-inherit-milestones-and-labels' into 'master'
copy milestones and labels from issue when using create merge request button

Closes #35343

See merge request !13461
2017-08-21 10:10:49 +00:00
Sean McGivern ac8c136e2c Merge branch 'issue_20900_remove_ignore_columns' into 'master'
Issue 20900 remove ignore columns

See merge request !12166
2017-08-21 10:09:19 +00:00
Phil Hughes b4c201a29f Merge branch '36458-user-profile-activity-feed-contains-broken-image-links' into 'master'
Resolve "User profile activity feed contains broken image links"

Closes #36458

See merge request !13606
2017-08-21 09:45:47 +00:00
Tim Zallmann 2bfee0706a Resolve "User profile activity feed contains broken image links" 2017-08-21 09:45:46 +00:00
Sean McGivern 6509833cfa Merge branch 'rouge-2.2.0' into 'master'
Bump rouge to 2.2.0

Closes #36554

See merge request !13633
2017-08-21 08:57:03 +00:00
Douwe Maan 2166f9f548 Merge branch 'rs-git-access-spec-speed' into 'master'
Greatly reduce test duration for git_access_spec

See merge request !13675
2017-08-21 08:46:52 +00:00
Douwe Maan e5f9f311a6 Merge branch 'mk-fix-user-namespace-rename' into 'master'
Make username update fail if namespace update fails

Closes gitlab-com/support-forum#2316

See merge request !13642
2017-08-21 08:41:39 +00:00
Tim Zallmann 76499825d6 Merge branch 'fix-broken-yarn-deps' into 'master'
Fix broken Yarn dependencies

Closes #33886 and #34944

See merge request !13614
2017-08-21 07:19:28 +00:00
Tim Zallmann 955d684cde Merge branch '36517-failing-karma-tests-for-chrome-60' into 'master'
Resolve "Failing karma tests for Chrome 60"

Closes #36517

See merge request !13646
2017-08-21 07:18:44 +00:00
Tim Zallmann 9279bf23d5 Merge branch 'remove-user-bundle' into 'master'
Remove superfluous users bundle

See merge request !13684
2017-08-21 07:13:33 +00:00
Zeger-Jan van de Weg f5b733ebdd
Fix broken links in documentation
Also, move the old linting docs to the new location.
2017-08-21 09:05:17 +02:00
Tim Zallmann 3d94e1e850 Merge branch 'issue-boards-closed-shows-empty-label' into 'master'
Fixed issue boards closed list displaying empty label

Closes #36650

See merge request !13658
2017-08-21 07:04:19 +00:00
Marcia Ramos 6cc53dd1ae Merge branch 'docs/gpg-refactor' into 'master'
Refactor GPG docs

See merge request !13660
2017-08-21 01:19:03 +00:00
winh f5e54edb11 Make project selection dropdown consistent 2017-08-20 23:21:57 +02:00
Achilleas Pipinellis e8e9c0c094 Merge branch 'update-create-project-getting-started' into 'master'
Update Create Project Getting Started

See merge request !13687
2017-08-20 20:43:35 +00:00
Fabio Busatto 216dac624c Update Create Project Getting Started 2017-08-20 20:43:34 +00:00
Yorick Peterse fbaae9ff5c Merge branch 'sh-fix-protected-tags-delete' into 'master'
Fix Error 500s when attempting to destroy a protected tag

Closes #36013

See merge request !13692
2017-08-20 12:12:10 +00:00
Stan Hu 718ecd4eb5 Fix Error 500s when attempting to destroy a protected tag
Due to a missing `on_delete: :cascade`, users would hit the error that
looked like:

```
PG::ForeignKeyViolation: ERROR: update or delete on table "protected_tags"
violates foreign key constraint "fk_rails_f7dfda8c51" on table
"protected_tag_create_access_levels" DETAIL: Key (id)=(1385) is still
referenced from table "protected_tag_create_access_levels". : DELETE FROM
"protected_tags" WHERE "protected_tags"."id" = 1385
```

Closes #36013
2017-08-20 03:32:31 -07:00