379a6a709a
Sidebar Milestone - Fix wrong URL when selecting a parent group milestone
2018-06-12 17:22:12 -06:00
893c824ed3
Merge branch 'pr-importer-io-extra-error-handling' into 'master'
...
Ensure MR diffs always exist in the PR importer
Closes #47312
See merge request gitlab-org/gitlab-ce!19704
2018-06-12 14:08:51 +00:00
8b0d2283d7
Merge branch 'gitaly-disk-access-3' into 'master'
...
Find and mark more Git disk access locations, part 2
See merge request gitlab-org/gitlab-ce!19437
2018-06-12 13:32:46 +00:00
f376347f24
Find and mark more Git disk access locations, part 2
2018-06-12 14:33:37 +02:00
ab93f7cc79
Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
2018-06-12 12:31:10 +00:00
e4612df0e2
Ensure MR diffs always exist in the PR importer
...
In rare cases it could happen that an MR was created, but creating the
MR diffs somehow failed (e.g. due to an error). This commit adds an
additional check to make sure MR diffs are always present when importing
GitHub pull requests.
2018-06-12 13:30:41 +02:00
450b9f6e30
Merge branch 'da-port-cte-to-ce' into 'master'
...
Add Gitlab::SQL:CTE for easily building CTE statements
See merge request gitlab-org/gitlab-ce!19652
2018-06-12 10:46:31 +00:00
421957cf8c
Merge branch 'sh-expire-content-cache-after-import' into 'master'
...
Expire Wiki content cache after importing a repository
Closes #47546
See merge request gitlab-org/gitlab-ce!19617
2018-06-11 17:35:39 +00:00
fe8261fdb2
Add Gitlab::SQL:CTE for easily building CTE statements
2018-06-11 12:44:08 -03:00
6defeb0a7d
Expire Wiki content cache after importing a repository
...
The cache state for Wikis that were imported via GitHub or Bitbucket does
not appear to have been flushed after a successful import.
Closes #47546
2018-06-11 08:33:06 -07:00
75797ac3d2
Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'
...
Resolve "Uploads specs are failing on master"
Closes #47684
See merge request gitlab-org/gitlab-ce!19638
2018-06-11 15:01:45 +00:00
1418afc2d6
Avoid checking the user format in every url validation
2018-06-11 13:29:37 +00:00
0f90c1fd73
Don't use Rails.root.join for upload fixture paths
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-06-11 13:54:25 +02:00
ea8dc10772
Don't use Gitlab::Utils.nlbr in Gitlab::Git
2018-06-11 10:42:09 +00:00
7d3bbeeb31
Merge branch 'rs-update-rspec' into 'master'
...
Update rspec to 3.7
See merge request gitlab-org/gitlab-ce!19449
2018-06-11 09:59:25 +00:00
68cb1c2651
Revert rename allow collaboration column
2018-06-08 13:12:51 +00:00
b780efab26
Merge remote-tracking branch 'origin/master' into 38542-application-control-panel-in-settings-page
2018-06-07 20:27:30 +02:00
290ca339ad
Merge branch 'feature/customizable-favicon' into 'master'
...
Customizable favicon
Closes #15661
See merge request gitlab-org/gitlab-ce!14497
2018-06-07 16:54:41 +00:00
7b562c9727
Merge branch 'sh-fix-schema-migrations-seq-scans' into 'master'
...
Avoid sequential scans loading schema_migrations table when loading application settings
See merge request gitlab-org/gitlab-ce!19541
2018-06-07 16:53:56 +00:00
36c3376475
Resolve "Hashed Storage: Make possible to migrate single project"
2018-06-07 15:40:44 +00:00
6afe6fa6bc
Make Gitlab::CurrentSettings.current_application_settings return cached settings early if they exist without issuing any DB query
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-06-07 17:23:49 +02:00
9f76632d80
Add installation type to usage ping data
2018-06-07 15:01:20 +00:00
6d165c740c
Make all uses of `fixture_file_upload` use relative paths
2018-06-07 09:54:41 -05:00
93c7976ae2
Restore navigation theme order
2018-06-07 12:24:57 +00:00
543459794a
Merge branch 'fj-move-rev-list-option' into 'master'
...
Moving rev-list lfs options to LfsChanges
See merge request gitlab-org/gitlab-ce!19497
2018-06-07 08:18:50 +00:00
164dbc6b77
Resolve "Introduce new navigation themes in GitLab 11.0"
2018-06-07 07:37:02 +00:00
86d39016a2
Moving rev-list lfs options to Lfschanges
2018-06-06 21:55:32 +02:00
9efb1875b7
Merge branch 'master' into 38542-application-control-panel-in-settings-page
2018-06-06 21:29:12 +02:00
e8f49b4bee
Support LFS objects when creating a project by import
2018-06-06 16:42:18 +00:00
e9ad837cf0
Merge branch '42751-rename-master-to-maintainer' into 'master'
...
Resolve "Rename the `Master` role to `Maintainer`"
Closes #42751
See merge request gitlab-org/gitlab-ce!19080
2018-06-06 15:00:24 +00:00
96747556e7
Merge branch 'live-trace-v2-persist-data' into 'master'
...
Live trace: Rescue stale live trace
See merge request gitlab-org/gitlab-ce!18680
2018-06-06 12:45:41 +00:00
a6c15c5b97
change wording
2018-06-06 21:01:44 +09:00
4083ea1c74
Merge branch 'rails5-fix-47376' into 'master'
...
Rails 5 fix glob spec
Closes #47376
See merge request gitlab-org/gitlab-ce!19469
2018-06-06 11:10:22 +00:00
45444c8e30
Merge branch '47189-github_import_visibility' into 'master'
...
Use Github repo visibility during import while respecting restricted visibility levels
Closes #47189
See merge request gitlab-org/gitlab-ce!19450
2018-06-06 10:54:43 +00:00
af9cc234f2
Merge branch 'bvl-graphql-start-34754' into 'master'
...
GraphQL setup: Basic Project and Merge request endpoint
Closes #34754
See merge request gitlab-org/gitlab-ce!19008
2018-06-06 10:03:34 +00:00
c5e44dc5d1
Use Github repo visibility during import while respecting restricted visibility levels
2018-06-06 12:00:15 +02:00
32f825c648
Add tests for each new code
2018-06-06 17:49:48 +09:00
2d1faddbcb
Rails 5 fix glob spec
2018-06-06 08:50:11 +02:00
a34666e655
Merge branch 'sh-reject-non-utf8-gpg' into 'master'
...
Reject GPG keys that have e-mail or names with non-valid UTF-8 encodings
Closes #47280
See merge request gitlab-org/gitlab-ce!19455
2018-06-05 22:07:35 +00:00
36a8f1a677
Reject GPG keys that have e-mail or names with non-valid UTF-8 encodings
...
These were causing 500 Errors when accessing GPG keys for some users.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47280
2018-06-05 14:39:44 -07:00
65dbead796
Fix repository archive generation when hashed storage is enabled
2018-06-05 20:44:07 +01:00
9c6c17cbcd
Add a minimal GraphQL API
2018-06-05 20:47:42 +02:00
ced0b4453e
Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'
...
# Conflicts:
# db/schema.rb
2018-06-05 16:46:43 +00:00
a0808df0b6
Find and mark more Git disk access locations
2018-06-05 15:51:14 +00:00
6ced2f1243
Merge branch '42751-rename-mr-maintainer-push' into 'master'
...
Rephrase Merge Request Maintainer Edit
See merge request gitlab-org/gitlab-ce!19061
2018-06-05 15:04:18 +00:00
949c30d42b
remove all .ico favicon variations, use png always
...
the ci status icons are generated client side, wo we don't need the
static files anymore.
2018-06-05 16:20:22 +02:00
9e14f437b6
create favicon overlay on the client
...
the initial reason for this change was that graphicsmagick does not
support writing to ico files. this fact lead to a chain of changes:
1. use png instead of ico (browser support is good enough)
2. render the overlays on the client using the canvas API. this way we
only need to store the original favion and generate the overlay versions
dynamically.
this change also enables (next step) to simplify the handling of the
stock favicons as well, as we don't need to generate all the versions
upfront.
2018-06-05 16:20:21 +02:00
67fe0a17d8
call Gitlab::Favicon.status in serializer
...
this ways we can keep the `lib/gitlab/ci/status/*` classes to return the
bare favicon name as it was before.
also the favicon uploader versions are now have the same names as the
stock favicons (+ `favicon_` prefix), which makes working with the
status names easier.
2018-06-05 16:20:21 +02:00
40ffa8401b
add request store caching to favicon
2018-06-05 16:20:21 +02:00
822023c64c
Add a '?' to the custom favicon's urls
...
Without the '?' at the end of the favicon url the custom favicon (i.e.
the favicons that are served through `UploadController`) are not shown
in the browser. It may have something to do with how `#send_file` /
`#send_data` set http headers. When serving the same icon file from the
public directory everything is fine.
2018-06-05 16:20:20 +02:00
Mario de la Ossa
Nick Thomas
Douwe Maan
Jacob Vosmaer
Francisco Javier López
Yorick Peterse
Mayra Cabrera
Douglas Barbosa Alexandre
Stan Hu
Sean McGivern
Rémy Coutable
Mark Chao
Kamil Trzciński
Gabriel Mazetto
Balasankar C
Robert Speicher
George Tsiolis
Annabel Gray
Matija Čupić
Imre Farkas
Shinya Maeda
Jasper Maes
Robert Speicher
Alexis Reigel
Alexis Reigel