Commit Graph

533 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 da0d8e0491 Fix `Routable.find_by_full_path` on MySQL 2017-05-06 09:45:25 +01: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
Sean McGivern 86e75ae092 Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable' 2017-05-05 22:00:36 +01:00
Michael Kozono 7d02bcd2e0 Redirect from redirect routes to canonical routes 2017-05-05 12:11:57 -07:00
Valery Sizov 34be1835af [Multiple issue assignee] Fix a number of specs 2017-05-05 15:30:19 +03: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
blackst0ne 7ad5a1b371 Add last_edited_at and last_edited_by attributes 2017-05-04 12:58:41 +11:00
Sean McGivern 21e4f0534d Merge branch 'dm-link-discussion-to-outdated-diff' into 'master'
Allow commenting on older versions of the diff and comparisons between diff versions

See merge request !10388
2017-05-03 21:27:34 +00:00
Douwe Maan f8fabfcc6f Allow commenting on older versions of the diff and comparisons between diff versions 2017-05-03 14:47:21 -05:00
Douwe Maan 720cc14a75 Refactor Blob support of external storage in preparation of job artifact blobs 2017-05-03 10:20:05 -05: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
Nick Thomas cb1207af36 Swap a before_save call with a before_create/before_update pair to avoid a confict with elasticsearch-model 2017-04-25 15:22:56 +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
Adam Niedzielski de71a46594 Display issuable state only in notes and issuable description
Closes #30964
2017-04-19 16:38:46 +02:00
Robert Speicher 58cd4c48e6 Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error 2017-04-12 13:59:35 -04:00
Douwe Maan 1817f877e1 Some code tweaks 2017-04-08 14:58:08 -05:00
Douwe Maan b202b42cfe Link to outdated diff in older MR version from outdated diff discussion 2017-04-08 14:37:46 -05:00
Luke "Jared" Bennett 8b98ca50b3
Merge branch 'master' into new-resolvable-discussion 2017-04-07 21:00:40 +01:00
Sean McGivern 314370282c Merge branch 'optimise-builds' into 'master'
Optimise Pipelines > Jobs index controller

Closes #27389

See merge request !10546
2017-04-07 18:09:14 +00:00
Kamil Trzcinski 16a2eba52b
Count number of queries 2017-04-07 18:34:03 +02:00
Douwe Maan 46aadc5c16 Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master'
Protected Tags

Closes #18471

See merge request !10356
2017-04-07 15:43:28 +00:00
Luke "Jared" Bennett 2f22890d42
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion 2017-04-07 12:09:20 +01:00
James Edwards-Jones 9db87fce13 Protected tags changes from backend maintainer review 2017-04-07 01:17:38 +01:00
Kushal Pandya 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
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
Douwe Maan bef1aca883 Merge branch '28695-move-all-associated-records-to-ghost-user' into 'master'
Resolve "Deleting a user shouldn't delete associated records"

Closes #28695 and #30514

See merge request !10467
2017-04-06 18:54:57 +00:00
Douwe Maan cc656a1199 Refactor resolvability checks based on type 2017-04-06 10:51:45 -05:00
Timothy Andrew 3e1a1242c6
Move a user's award emoji to the ghost user
... when the user is destroyed.

1. Normally, for a given awardable and award emoji name, a user is only allowed
   to create a single award emoji.

2. This validation needs to be removed for ghost users, since:

   - User A and User B have created award emoji - with the same name and against
     the same awardable
   - User A is deleted. Their award emoji is moved to the ghost user
   - User B is deleted. Their award emoji needs to be moved to the ghost user.
     However, this breaks the uniqueness validation, since the ghost user is
     only allowed to have one award emoji of a given name for a given awardable
2017-04-06 18:59:17 +05:30
James Edwards-Jones f16377e7dc Protected Tags backend review changes
Added changelog
2017-04-06 10:56:21 +01:00
Kushal Pandya 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
Alexis Reigel 63e61cfd83 use more explicit and explanatory sql statement 2017-04-06 10:01:14 +02:00
Alexis Reigel 20575859b1 check all groups for 2fa requirement 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
Douwe Maan 63c7801e45
Remove and ignore notes.original_discussion_id column 2017-04-05 17:44:14 +01:00
Douwe Maan c319f21141
Address review comments 2017-04-05 17:44:14 +01:00
Douwe Maan 21e10888c3
Address review comments 2017-04-05 17:44:14 +01:00
Douwe Maan bb8cc94668
Don't use original_discussion_id 2017-04-05 17:44:14 +01:00
Douwe Maan 2058e71e63
Extract commonalities between DiffDiscussion and LegacyDiffDiscussion 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
Rydkin Maxim c81ef3041e add auto-cancel for pending pipelines on branch, if they are not HEAD
fix changelog MR reference

add non-HEAD builds finder and add `created` pipelines to scope

add spec for auto-cancel non-HEAD pipelines and refactor create_pipeline_service_spec

more refactoring for spec

adds option for auto-cancel into CI/CD settings

fix spec to new configuration

fix rubocop

fix schema.rb

fix schema.rb

replace Gitlab 9.0 with 9.1 in doc

change wording on pipeline settings

added auto_canceled_by field as identifier of autocancel subject

remove unnecessary index

replace service with retry_lock

replace auto_cancel_pending_pipelines boolean setting with integer (and enum in model)

fix schema.rb

fix schema.rb

remove projekt attribute and clean up spec

clean up spec withcouple of shared examples

added spec for "It does not cancel current pipeline" scenario

add some specs to auto-cancel

add spec for another branch pipelines
2017-04-04 21:11:24 +03:00
James Edwards-Jones d85471ac1a Fixed UserAccess#can_create_tag? after create_access_levels rename 2017-04-04 03:50:15 +01:00
James Edwards-Jones f9e849c076 Cleaned up duplication with ProtectedRefAccess concern 2017-04-04 02:59:37 +01:00
James Edwards-Jones 1e15444ae6 Cleanup & tests for UserAccess#can_create_tag? 2017-04-04 02:05:42 +01:00
James Edwards-Jones 90c8bb8301 Fixed developers_can_push in RepoBranch API entity 2017-04-04 01:39:34 +01:00