Skip to content

Commit 8ae2220

Browse files
committed
Merge branch 'master' into feature/svg-badge-template
* master: (363 commits) Added changelog item for issuable form dropdowns Add 'run tests' docs from GDK Bump gitlab_git to lazy load compare commits Add examples to repository files API (!5465) Ignore URLs starting with // (!5677) Add failing test for gitlabhq#7032 Update timeago to shorter representation Add missing DOWNTIME constant to the AddTimestampsToMembersAgain migration Added guide about migrations and downtime Update CHANGELOG for 8.10.4 Add a data migration to fix some missing timestamps in the members table (again) Move abilities by subject class to a dedicated method Remove unnecessary empty line after css var Set consistency in list text height css Add description to text/plain emails Fix Rename `add_users_into_project` and `projects_ids` fix spec Underscore variable to camelCase using shared path for project import uploads and refactored gitlab remove export worker Structure the development documentation ...
2 parents 1b5e230 + 9103023 commit 8ae2220

File tree

450 files changed

+8621
-3708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

450 files changed

+8621
-3708
lines changed

.gitlab-ci.yml

+43-3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ stages:
2828
- prepare
2929
- test
3030
- post-test
31+
- pages
3132

3233
# Prepare and merge knapsack tests
3334
.knapsack-state: &knapsack-state
@@ -40,6 +41,7 @@ stages:
4041
paths:
4142
- knapsack/
4243
artifacts:
44+
expire_in: 31d
4345
paths:
4446
- knapsack/
4547

@@ -81,8 +83,10 @@ update-knapsack:
8183
- cp knapsack/rspec_report.json ${KNAPSACK_REPORT_PATH}
8284
- knapsack rspec
8385
artifacts:
86+
expire_in: 31d
8487
paths:
8588
- knapsack/
89+
- coverage/
8690

8791
.spinach-knapsack: &spinach-knapsack
8892
stage: test
@@ -97,8 +101,10 @@ update-knapsack:
97101
- cp knapsack/spinach_report.json ${KNAPSACK_REPORT_PATH}
98102
- knapsack spinach "-r rerun" || retry '[ ! -e tmp/spinach-rerun.txt ] || bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
99103
artifacts:
104+
expire_in: 31d
100105
paths:
101106
- knapsack/
107+
- coverage/
102108

103109
rspec 0 20: *rspec-knapsack
104110
rspec 1 20: *rspec-knapsack
@@ -186,14 +192,14 @@ spinach 9 10 ruby23: *spinach-knapsack-ruby23
186192

187193
# Other generic tests
188194

189-
.static-analyses-variables: &static-analyses-variables
195+
.ruby-static-analysis: &ruby-static-analysis
190196
variables:
191197
SIMPLECOV: "false"
192198
USE_DB: "false"
193199
USE_BUNDLE_INSTALL: "true"
194200

195201
.exec: &exec
196-
<<: *static-analyses-variables
202+
<<: *ruby-static-analysis
197203
stage: test
198204
script:
199205
- bundle exec $CI_BUILD_NAME
@@ -220,16 +226,35 @@ teaspoon:
220226

221227
bundler:audit:
222228
stage: test
223-
<<: *static-analyses-variables
229+
<<: *ruby-static-analysis
224230
only:
225231
- master
226232
script:
227233
- "bundle exec bundle-audit check --update --ignore OSVDB-115941"
228234

235+
coverage:
236+
stage: post-test
237+
services: []
238+
variables:
239+
USE_DB: "false"
240+
USE_BUNDLE_INSTALL: "true"
241+
script:
242+
- bundle exec scripts/merge-simplecov
243+
artifacts:
244+
name: coverage
245+
expire_in: 31d
246+
paths:
247+
- coverage/index.html
248+
- coverage/assets/
249+
250+
229251
# Notify slack in the end
230252

231253
notify:slack:
232254
stage: post-test
255+
variables:
256+
USE_DB: "false"
257+
USE_BUNDLE_INSTALL: "false"
233258
script:
234259
- ./scripts/notify_slack.sh "#builds" "Build on \`$CI_BUILD_REF_NAME\` failed! Commit \`$(git log -1 --oneline)\` See <https://gitlab.com/gitlab-org/$(basename "$PWD")/commit/"$CI_BUILD_REF"/builds>"
235260
when: on_failure
@@ -238,3 +263,18 @@ notify:slack:
238263
- tags@gitlab-org/gitlab-ce
239264
- master@gitlab-org/gitlab-ee
240265
- tags@gitlab-org/gitlab-ee
266+
267+
pages:
268+
before_script: []
269+
stage: pages
270+
dependencies:
271+
- coverage
272+
script:
273+
- mv public/ .public/
274+
- mkdir public/
275+
- mv coverage public/coverage-ruby
276+
artifacts:
277+
paths:
278+
- public
279+
only:
280+
- master

.rubocop.yml

+9
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,15 @@ Metrics/PerceivedComplexity:
510510

511511
#################### Lint ################################
512512

513+
# Checks for useless access modifiers.
514+
Lint/UselessAccessModifier:
515+
Enabled: true
516+
517+
# Checks for attempts to use `private` or `protected` to set the visibility
518+
# of a class method, which does not work.
519+
Lint/IneffectiveAccessModifier:
520+
Enabled: false
521+
513522
# Checks for ambiguous operators in the first argument of a method invocation
514523
# without parentheses.
515524
Lint/AmbiguousOperator:

.rubocop_todo.yml

-8
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ Lint/AssignmentInCondition:
1919
Lint/HandleExceptions:
2020
Enabled: false
2121

22-
# Offense count: 21
23-
Lint/IneffectiveAccessModifier:
24-
Enabled: false
25-
2622
# Offense count: 2
2723
Lint/Loop:
2824
Enabled: false
@@ -48,10 +44,6 @@ Lint/UnusedBlockArgument:
4844
Lint/UnusedMethodArgument:
4945
Enabled: false
5046

51-
# Offense count: 11
52-
Lint/UselessAccessModifier:
53-
Enabled: false
54-
5547
# Offense count: 12
5648
# Cop supports --auto-correct.
5749
Performance/PushSplat:

.simplecov

-4
This file was deleted.

CHANGELOG

+91-8
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,117 @@
11
Please view this file on the master branch, on stable branches it's out of date.
22

33
v 8.11.0 (unreleased)
4+
- Fix don't pass a local variable called `i` to a partial. !20510 (herminiotorres)
5+
- Fix rename `add_users_into_project` and `projects_ids`. !20512 (herminiotorres)
6+
- Fix the title of the toggle dropdown button. !5515 (herminiotorres)
7+
- Improve diff performance by eliminating redundant checks for text blobs
8+
- Convert switch icon into icon font (ClemMakesApps)
49
- Remove magic comments (`# encoding: UTF-8`) from Ruby files. !5456 (winniehell)
10+
- Add support for relative links starting with ./ or / to RelativeLinkFilter (winniehell)
11+
- Ignore URLs starting with // in Markdown links !5677 (winniehell)
512
- Fix CI status icon link underline (ClemMakesApps)
13+
- The Repository class is now instrumented
14+
- Cache the commit author in RequestStore to avoid extra lookups in PostReceive
15+
- Expand commit message width in repo view (ClemMakesApps)
16+
- Cache highlighted diff lines for merge requests
617
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
718
- Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable
819
- Optimize maximum user access level lookup in loading of notes
20+
- Add "No one can push" as an option for protected branches. !5081
21+
- Improve performance of AutolinkFilter#text_parse by using XPath
22+
- Environments have an url to link to
23+
- Update `timeago` plugin to use multiple string/locale settings
24+
- Remove unused images (ClemMakesApps)
925
- Limit git rev-list output count to one in forced push check
1026
- Clean up unused routes (Josef Strzibny)
1127
- Add green outline to New Branch button. !5447 (winniehell)
28+
- Improve performance of syntax highlighting Markdown code blocks
29+
- Update to gitlab_git 10.4.1 and take advantage of preserved Ref objects
30+
- Remove delay when hitting "Reply..." button on page with a lot of discussions
1231
- Retrieve rendered HTML from cache in one request
32+
- Fix renaming repository when name contains invalid chararacters under project settings
33+
- Fix devise deprecation warnings.
34+
- Optimize checking if a user has read access to a list of issues !5370
1335
- Nokogiri's various parsing methods are now instrumented
36+
- Add simple identifier to public SSH keys (muteor)
37+
- Add a way to send an email and create an issue based on private personal token. Find the email address from issues page. !3363
38+
- Fix filter input alignment (ClemMakesApps)
39+
- Include old revision in merge request update hooks (Ben Boeckel)
40+
- Add build event color in HipChat messages (David Eisner)
1441
- Make fork counter always clickable. !5463 (winniehell)
42+
- Gitlab::Highlight is now instrumented
43+
- All created issues, API or WebUI, can be submitted to Akismet for spam check !5333
44+
- The overhead of instrumented method calls has been reduced
1545
- Remove `search_id` of labels dropdown filter to fix 'Missleading URI for labels in Merge Requests and Issues view'. !5368 (Scott Le)
1646
- Load project invited groups and members eagerly in `ProjectTeam#fetch_members`
47+
- Bump gitlab_git to speedup DiffCollection iterations
48+
- Rewrite description of a blocked user in admin settings. (Elias Werberich)
1749
- Make branches sortable without push permission !5462 (winniehell)
50+
- Check for Ci::Build artifacts at database level on pipeline partial
51+
- Convert image diff background image to CSS (ClemMakesApps)
52+
- Remove unnecessary index_projects_on_builds_enabled index from the projects table
53+
- Make "New issue" button in Issue page less obtrusive !5457 (winniehell)
54+
- Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
55+
- Fix search for notes which belongs to deleted objects
1856
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
57+
- Allow branch names ending with .json for graph and network page !5579 (winniehell)
1958
- Add the `sprockets-es6` gem
2059
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
2160
- Profile requests when a header is passed
22-
23-
v 8.10.2 (unreleased)
61+
- Avoid calculation of line_code and position for _line partial when showing diff notes on discussion tab.
62+
- Speedup DiffNote#active? on discussions, preloading noteables and avoid touching git repository to return diff_refs when possible
63+
- Add commit stats in commit api. !5517 (dixpac)
64+
- Add CI configuration button on project page
65+
- Make error pages responsive (Takuya Noguchi)
66+
- Fix skip_repo parameter being ignored when destroying a namespace
67+
- Change requests_profiles resource constraint to catch virtually any file
68+
- Bump gitlab_git to lazy load compare commits
69+
- Reduce number of queries made for merge_requests/:id/diffs
70+
- Sensible state specific default sort order for issues and merge requests !5453 (tomb0y)
71+
- Fix RequestProfiler::Middleware error when code is reloaded in development
72+
- Catch what warden might throw when profiling requests to re-throw it
73+
- Add description to new_issue email and new_merge_request_email in text/plain content type. !5663 (dixpac)
74+
- Speed up and reduce memory usage of Commit#repo_changes, Repository#expire_avatar_cache and IrkerWorker
75+
- Add unfold links for Side-by-Side view. !5415 (Tim Masliuchenko)
76+
77+
v 8.10.5 (unreleased)
78+
79+
v 8.10.4
80+
- Don't close referenced upstream issues from a forked project.
81+
- Fixes issue with dropdowns `enter` key not working correctly. !5544
82+
- Fix Import/Export project import not working in HA mode. !5618
83+
- Fix Import/Export error checking versions. !5638
84+
85+
v 8.10.3
86+
- Fix Import/Export issue importing milestones and labels not associated properly. !5426
87+
- Fix timing problems running imports on production. !5523
88+
- Add a log message when a project is scheduled for destruction for debugging. !5540
89+
- Fix hooks missing on imported GitLab projects. !5549
90+
- Properly abort a merge when merge conflicts occur. !5569
91+
- Fix importer for GitHub Pull Requests when a branch was removed. !5573
92+
- Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured. !5584
93+
- Trim extra displayed carriage returns in diffs and files with CRLFs. !5588
94+
95+
v 8.10.2
2496
- User can now search branches by name. !5144
25-
- Add ENV variable to skip repository storages validations
97+
- Page is now properly rendered after committing the first file and creating the first branch. !5399
98+
- Add branch or tag icon to ref in builds page. !5434
2699
- Fix backup restore. !5459
27-
- Rescue Rugged::OSError (lock exists) when creating references. !5497
28-
- Disable MySQL foreign key checks before dropping all tables. !5472
29-
- Fix a bug where forking a project from a repository storage to another would fail
30-
- Show release notes in tags list
31100
- Use project ID in repository cache to prevent stale data from persisting across projects. !5460
101+
- Fix issue with autocomplete search not working with enter key. !5466
102+
- Add iid to MR API response. !5468
103+
- Disable MySQL foreign key checks before dropping all tables. !5472
32104
- Ensure relative paths for video are rewritten as we do for images. !5474
33105
- Ensure current user can retry a build before showing the 'Retry' button. !5476
34-
- Fix expand all diffs button in compare view
106+
- Add ENV variable to skip repository storages validations. !5478
107+
- Added `*.js.es6 gitlab-language=javascript` to `.gitattributes`. !5486
108+
- Don't show comment button in gutter of diffs on MR discussion tab. !5493
109+
- Rescue Rugged::OSError (lock exists) when creating references. !5497
110+
- Fix expand all diffs button in compare view. !5500
111+
- Show release notes in tags list. !5503
112+
- Fix a bug where forking a project from a repository storage to another would fail. !5509
113+
- Fix missing schema update for `20160722221922`. !5512
114+
- Update `gitlab-shell` version to 3.2.1 in the 8.9->8.10 update guide. !5516
35115

36116
v 8.10.1
37117
- Refactor repository storages documentation. !5428
@@ -89,6 +169,9 @@ v 8.10.0
89169
- Fix check for New Branch button on Issue page. !4630 (winniehell)
90170
- Fix GFM autocomplete not working on wiki pages
91171
- Fixed enter key not triggering click on first row when searching in a dropdown
172+
- Updated dropdowns in issuable form to use new GitLab dropdown style
173+
- Make images fit to the size of the viewport !4810
174+
- Fix check for New Branch button on Issue page !4630 (winniehell)
92175
- Fix MR-auto-close text added to description. !4836
93176
- Support U2F devices in Firefox. !5177
94177
- Fix issue, preventing users w/o push access to sort tags. !5105 (redetection)

CONTRIBUTING.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ abbreviation.
4141
If you have read this guide and want to know how the GitLab [core team]
4242
operates please see [the GitLab contributing process](PROCESS.md).
4343

44+
- [GitLab Inc engineers should refer to the engineering workflow document](https://about.gitlab.com/handbook/engineering/workflow/)
45+
4446
## Contributor license agreement
4547

4648
By submitting code as an individual you agree to the
@@ -460,7 +462,8 @@ merge request:
460462
- string literal quoting style **Option A**: single quoted by default
461463
1. [Rails](https://github.com/bbatsov/rails-style-guide)
462464
1. [Testing](doc/development/testing.md)
463-
1. [CoffeeScript](https://github.com/thoughtbot/guides/tree/master/style/coffeescript)
465+
1. [JavaScript (ES6)](https://github.com/airbnb/javascript)
466+
1. [JavaScript (ES5)](https://github.com/airbnb/javascript/tree/master/es5)
464467
1. [SCSS styleguide][scss-styleguide]
465468
1. [Shell commands](doc/development/shell_commands.md) created by GitLab
466469
contributors to enhance security

Gemfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ gem 'browser', '~> 2.2'
5353

5454
# Extracting information from a git repository
5555
# Provide access to Gitlab::Git library
56-
gem 'gitlab_git', '~> 10.3.2'
56+
gem 'gitlab_git', '~> 10.4.5'
5757

5858
# LDAP Auth
5959
# GitLab fork with several improvements to original library. For full list of changes
@@ -225,7 +225,7 @@ gem 'addressable', '~> 2.3.8'
225225
gem 'bootstrap-sass', '~> 3.3.0'
226226
gem 'font-awesome-rails', '~> 4.6.1'
227227
gem 'gemojione', '~> 3.0'
228-
gem 'gon', '~> 6.0.1'
228+
gem 'gon', '~> 6.1.0'
229229
gem 'jquery-atwho-rails', '~> 1.3.2'
230230
gem 'jquery-rails', '~> 4.1.0'
231231
gem 'jquery-ui-rails', '~> 5.0.0'
@@ -253,7 +253,7 @@ group :development do
253253

254254
gem 'letter_opener_web', '~> 1.3.0'
255255
gem 'rerun', '~> 0.11.0'
256-
gem 'bullet', '~> 5.0.0', require: false
256+
gem 'bullet', '~> 5.2.0', require: false
257257
gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
258258
gem 'web-console', '~> 2.0'
259259

@@ -303,7 +303,7 @@ group :development, :test do
303303
gem 'rubocop', '~> 0.41.2', require: false
304304
gem 'rubocop-rspec', '~> 1.5.0', require: false
305305
gem 'scss_lint', '~> 0.47.0', require: false
306-
gem 'simplecov', '~> 0.11.0', require: false
306+
gem 'simplecov', '0.12.0', require: false
307307
gem 'flog', '~> 4.3.2', require: false
308308
gem 'flay', '~> 2.6.1', require: false
309309
gem 'bundler-audit', '~> 0.5.0', require: false
@@ -326,7 +326,7 @@ group :production do
326326
gem 'gitlab_meta', '7.0'
327327
end
328328

329-
gem 'newrelic_rpm', '~> 3.14'
329+
gem 'newrelic_rpm', '~> 3.16'
330330

331331
gem 'octokit', '~> 4.3.0'
332332

0 commit comments

Comments
 (0)