Commit Graph

197 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets 11ff9fc6a9 Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' into 'master'
Use regex to skip unnecessary reference processing in ProcessCommitWorker

Closes #28359

See merge request !10867
2017-05-08 12:54:23 +00:00
Sean McGivern 56fb7823f9 Merge branch '17361-redirect-renamed-paths' into 'master'
Resolve "Redirect to new project link after a rename"

Closes #17361 and #30317

See merge request !11136
2017-05-06 05:45:56 +00:00
Michael Kozono 7d02bcd2e0 Redirect from redirect routes to canonical routes 2017-05-05 12:11:57 -07:00
James Edwards-Jones 020295fffc Use regex to skip unnecessary reference processing in ProcessCommitWorker 2017-05-04 20:03:46 +01:00
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
Bob Van Landuyt 3dd2476eb3 Refresh the markdown cache if it was `nil`
If the cached html_field for a markdown_field is `nil` while the
mfarkdown_field is not, it needs to be refreshed.
2017-05-02 15:24:41 +02:00
Robert Speicher 2952a44779 Merge branch 'enable-spec-file-name-cop' into 'master'
Enable RSpec/FilePath cop

Closes #31316

See merge request !10911
2017-04-28 18:02:17 +00:00
Sean McGivern 5069682d8e Enable RSpec/FilePath cop
- Ignore JS fixtures
- Ignore qa directory
- Rewrite concern specs to put concern name first
2017-04-26 12:50:32 +01:00
Nick Thomas 0e24b1280e Fix a failing spec 2017-04-25 17:13:44 +01:00
Stan Hu a0edaa9210 Cache Routable#full_path in RequestStore to reduce duplicate route loads
We see in #27387 that a call to `polymorphic_path` will cause duplicate
SELECT route calls for each merge request in a milestone. This happens
because calling `project.namespace.becomes(Namespace)` will instantiate
a new instance of a Namespace for each merge request, which causes a N+1
query on the routes table. This change caches the state of the route by
the specific class and ID, which dramatically eliminates duplicate work.
2017-04-24 06:43:24 -07:00
Nick Thomas d2b883b750 Start versioning cached markdown fields 2017-04-21 17:24:33 +01:00
Nick Thomas e9819de10a Remove the ClearDatabaseCacheWorker 2017-04-21 11:52:28 +01:00
Yorick Peterse 223d8a3d26
Prepare for zero downtime migrations
Starting with GitLab 9.1.0 we will no longer allow downtime migrations
unless absolutely necessary. This commit updates the various developer
guides and adds code that is necessary to make zero downtime migrations
less painful.
2017-04-12 18:15:19 +02:00
Luke "Jared" Bennett 2f22890d42
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion 2017-04-07 12:09:20 +01:00
Douwe Maan 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
Lin Jen-Shin e28fc7b1d3 Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head
* upstream/master: (197 commits)
  Add text to break up diagrams
  Implement review comments from @DouweM for !10467.
  Fix rubocop offence
  Linking to edit file directly
  Optimise trace handling code to use streaming instead of full read
  Use config.toml to configure Gitaly
  Fix indexes in container repositories table
  Recent search history for issues
  Fix rubocop
  Use change direction in spec
  Use be_pending
  Improve trigger_schedule.rb
  Implement a offset calculation on cron_parser_spec
  Clean up trigger_schedule_worker_spec.rb
  Improve instantiate recursion in cron_parser.rb
  Fix unnecessary changes in schema.rb
  Add empty line in cron_parser.rb
  Use parenthesis for respond_to :ref
  Define next_time as let in trigger_schedule_spec
  Remove next_run_at: nil from trigger_schedule_spec
  ...
2017-04-07 03:16:28 +08:00
Alexis Reigel 63e61cfd83 use more explicit and explanatory sql statement 2017-04-06 10:01:14 +02:00
Alexis Reigel 5ea4e34f47 add method to get a full routable hierarchy 2017-04-06 10:01:14 +02:00
Lin Jen-Shin 6bf1780aa8 Add tests for relations and scopes, and setting 2017-04-06 02:21:31 +08:00
Douwe Maan c319f21141
Address review comments 2017-04-05 17:44:14 +01:00
Douwe Maan afa53810de
Fix specs 2017-04-05 17:44:14 +01:00
Douwe Maan 79889a6aa3
Add specs 2017-04-05 17:44:14 +01:00
Douwe Maan 08bbb9fce6
Add option to start a new discussion on an MR 2017-04-05 17:44:14 +01:00
James Edwards-Jones 5b41b79279 Prevented error on nil author from Issuable delegation 2017-03-21 12:52:27 +00:00
Grzegorz Bizon 0b5e139278 Extend compound status for manual actions specs 2017-03-20 20:28:37 +01:00
Grzegorz Bizon f441b95bb3 Fix pipeline status for transition between stages 2017-03-20 19:16:48 +01:00
Luke "Jared" Bennett f2be76f3e8
Added labels to the issue web hook 2017-03-17 12:14:26 +00:00
Michael 6924b4d336 Issue milestone remaining time tooltip 2017-03-16 11:34:46 +00:00
Sean McGivern 101fddfa92 Allow sorting by due date and label priority 2017-03-15 17:02:37 +00:00
Valery Sizov e752d6d157 [Issue sorting]Addressed review comments 2017-03-14 14:11:59 +02:00
Valery Sizov b84723ac8b [Issue Sorting] Improve migration 2017-03-14 14:11:59 +02:00
Valery Sizov 5670777735 [Issue sorting] Filling positions preferable in the middle 2017-03-14 14:11:59 +02:00
Valery Sizov 96fe1856da Fix relative position calculation 2017-03-14 14:11:18 +02:00
Douwe Maan 8a199f324b Remove unneccessary blank lines 2017-03-07 16:45:41 -06:00
Valery Sizov 9895d6707d [Issue Board Sorting] More accurate move through the list 2017-03-07 21:02:08 +02:00
Valery Sizov 539a523553 Fix rubocop 2017-03-07 13:56:35 +02:00
Valery Sizov a8cf2e8d54 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues 2017-03-07 13:42:45 +02:00
Valery Sizov a0108c6925 Address review comments 2017-03-07 13:42:17 +02:00
Valery Sizov 13caadea7a Addressing review comments 2017-03-06 18:08:18 +02:00
Grzegorz Bizon cb4c9a03ce Extend specs for code we use to calculate statuses 2017-03-06 13:54:29 +01:00
Valery Sizov 800f2a722f [Issue board sorting] Specs 2017-02-28 16:52:49 +02:00
Douwe Maan a0da03d95c Merge branch '12726-preserve-issues-after-deleting-users' into 'master'
Deleting a user shouldn't delete associated issues.

Closes #12726

See merge request !7393
2017-02-24 16:04:06 +00:00
Timothy Andrew f2ed82fa84
Implement final review comments from @DouweM and @rymai
- Have `Uniquify` take a block instead of a Proc/function. This is more
  idiomatic than passing around a function in Ruby.

- Block a user before moving their issues to the ghost user. This avoids a data
  race where an issue is created after the issues are migrated to the ghost user,
  and before the destroy takes place.

- No need to migrate issues (to the ghost user) in a transaction, because
  we're using `update_all`

- Other minor changes
2017-02-24 16:50:20 +05:30
Timothy Andrew 8f01644ff4
Implement review comments from @rymai and @yorickpeterse
1. Refactoring and specs in the `Uniquify` class.

2. Don't use the `AdvisoryLocking` class. Similar functionality is
provided (backed by Redis) in the `ExclusiveLease` class.
2017-02-24 16:50:20 +05:30
Douwe Maan ad640bc5f9 Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
Douwe Maan 1fe7501b49 Revert "Prefer leading style for Style/DotPosition"
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
2017-02-23 09:33:05 -06:00
Douwe Maan 206953a430 Prefer leading style for Style/DotPosition 2017-02-23 09:32:22 -06:00
Douwe Maan 02494f7ce8 Fix specs 2017-02-23 09:31:57 -06:00
Oswaldo Ferreira 2ace39f242 Spam check and reCAPTCHA improvements 2017-02-21 13:32:49 -03:00
Z.J. van de Weg 5be8f03747 Improve performance of User Agent Detail 2017-02-20 16:28:13 +01:00