Commit Graph

6562 Commits

Author SHA1 Message Date
Sean McGivern 7ea12d8067 Merge branch 'mrchrisw-fix-slack-notify' into 'master'
Fix notify_only_default_branch check for Slack service

See merge request !11154
2017-05-09 08:18:48 +00:00
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00
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 09e2c1afb1 Merge branch 'sh-fix-almost-there-spec-mysql' into 'master'
Fix sub-second timing comparison error for Devise confirmation period

Closes gitlab-ee#2362

See merge request !11156
2017-05-08 11:06:54 +00:00
James Lopez 1a5e84febe Merge branch 'fix/gl-project-id' into 'master'
Omit gl_project_id from Import/Export

Closes #29813

See merge request !11032
2017-05-08 06:52:01 +00:00
Chris Wilson 52c8651a6c Fix notify_only_default_branch check for Slack service
The notify_only_default_branch property is using boolean_accessor
this means we need to check it using a question methods.
Also add specs for disabling this option.
2017-05-08 15:55:02 +10:00
Stan Hu c175c30da7 Fix sub-second timing comparison error for Devise confirmation period
On databases such as MySQL, it's possible to get into a timing comparison
error if the value of `Confirmable#confirmation_sent_at` is within a second
of `0.days.ago`. This is possible mostly in specs that test this behavior
and most likely not happening in practice. The result of this error causes
a user to be deemed active when it should be inactive. To prevent this
error, we explicitly check the configuration setting to be `0.days.ago`.

Closes gitlab-org/gitlab-ee#2362
2017-05-07 22:11:09 -07:00
Robert Speicher 8b9cd3c072 Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master'
Add support for commit diff ignore_whitespace_change and paths flags

Closes gitaly#198

See merge request !11028
2017-05-07 22:59:30 +00:00
Zeger-Jan van de Weg 8df3997a92 Add Pipeline Schedules that supersedes experimental Trigger Schedule 2017-05-07 22:35:56 +00:00
Ahmad Sherif 34cd109797 Re-enable Gitaly commit_raw_diff feature 2017-05-07 23:37:42 +02:00
Kamil Trzciński 6ad3814e1b Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into 'master'
Check access to a branch when user triggers manual action

Closes #20261

See merge request !10494
2017-05-06 17:17:02 +00:00
Zeger-Jan van de Weg c17e6a6c68 Real time pipeline show action 2017-05-06 16:45:46 +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
Michael Kozono b0ee22609a Reduce risk of deadlocks
We’ve seen a deadlock in CI here https://gitlab.com/mkozono/gitlab-ce/builds/15644492#down-build-trace. This commit should not fix that particular failure, but perhaps it will avoid others.

* Don’t call delete_conflicting_redirects after update if the path wasn’t changed
* Rename descendants without using recursion again, so we can run delete_conflicting_redirects exactly once.
2017-05-05 14:31:33 -07:00
Sean McGivern 86e75ae092 Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable' 2017-05-05 22:00:36 +01:00
Jacob Schatz aa874a1cd6 Merge branch 'mia_backort' into 'master'
Backport of Multiple Assignees feature

See merge request !11089
2017-05-05 19:17:28 +00:00
Michael Kozono e1c245af51 Resolve discussions 2017-05-05 12:12:51 -07:00
Michael Kozono f05469f99b Resolve discussions 2017-05-05 12:12:50 -07:00
Michael Kozono 0c866f4a57 Resolve discussions 2017-05-05 12:12:49 -07:00
Michael Kozono ca5c762cf5 Refactor 2017-05-05 12:11:58 -07:00
Michael Kozono 72872ee213 Delete conflicting redirects 2017-05-05 12:11:58 -07:00
Michael Kozono a0368e9131 Create redirect routes on path change 2017-05-05 12:11:58 -07:00
Michael Kozono 7d02bcd2e0 Redirect from redirect routes to canonical routes 2017-05-05 12:11:57 -07:00
Phil Hughes ecaa68a709 Merge branch 'balsalmiq-support' into 'master'
Initial balsamiq support

See merge request !10564
2017-05-05 18:43:13 +00:00
Phil Hughes b815353510 Merge branch 'add-sentry-js-again-with-vue' into 'master'
Add sentry JS

See merge request !6764
2017-05-05 17:51:38 +00:00
Valery Sizov 5004579b15 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci skip] 2017-05-05 16:59:31 +03:00
Valery Sizov 34be1835af [Multiple issue assignee] Fix a number of specs 2017-05-05 15:30:19 +03:00
Grzegorz Bizon b6facd8313 Merge commit '3a2b60f7' from 'master'
* commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (151 commits)
  Fixed Karma spec
  Reject EE reserved namespace paths in CE as well
  Updated webpack config
  Include the bundler:audit job into the static-analysis job
  Document serializers
  Add artifact file page that uses the blob viewer
  Pipeline table mini graph dropdown remains open when table is refreshed
  Adds off for event hub
  Compile gitlab-shell go executables
  Allow to create new branch and empty WIP merge request from issue page
  Moved to a view spec
  Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.md
  Convert seconds to minutes and hours on chat notifations
  Disable navigation to Pages config if Pages is disabled
  Sort the network graph both by commit date and topographically.
  Add tooltips to note action buttons
  Add breadcrumb, build header and pipelines submenu to artifacts browser
  Update todos screenshots
  removes the possibility of commit messages having carriage returns
  Handle incoming emails from aliases correctly
  ...
2017-05-05 12:22:46 +02:00
Ruben Davila 7fd42698aa Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Conflicts:
	lib/gitlab/cycle_analytics/review_stage.rb
	lib/gitlab/cycle_analytics/staging_stage.rb
	lib/gitlab/cycle_analytics/test_stage.rb
2017-05-04 18:51:18 -05:00
Luke "Jared" Bennett 12fbce2eac Merge branch 'master' into 'add-sentry-js-again-with-vue'
# Conflicts:
#   db/schema.rb
2017-05-04 22:48:21 +00:00
James Edwards-Jones 020295fffc Use regex to skip unnecessary reference processing in ProcessCommitWorker 2017-05-04 20:03:46 +01:00
Douglas Barbosa Alexandre 9f2edaa846 Update last_repository_updated_at when the wiki is updated 2017-05-04 15:44:11 -03:00
Douglas Barbosa Alexandre 91b5aaf770 Update last_repository_updated_at when a push event is created 2017-05-04 15:36:04 -03:00
Douglas Barbosa Alexandre 56db54d3e5 Set last_repository_updated_at to created_at upon project creation 2017-05-04 15:36:04 -03:00
Valery Sizov 0f2a9681a3 [Multiple issue assignees] Resolving conflicts 2017-05-04 20:00:33 +03:00
Sean McGivern d3768dd796 Merge branch 'dm-artifact-blob-viewer' into 'master'
Use blob viewer for job artifacts

Closes #31297

See merge request !11018
2017-05-04 15:01:54 +00:00
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
Douwe Maan 0f58eb6bde Add artifact file page that uses the blob viewer 2017-05-04 08:50:12 -05:00
Luke "Jared" Bennett d34f676414
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue 2017-05-04 11:21:40 +01:00
Kamil Trzciński 68c12e15cc Merge branch 'always-show-latest-pipeline-in-commit-box' into 'master'
Always show latest pipeline info in commit box

Closes #31378

See merge request !11038
2017-05-04 08:56:03 +00:00
Sean McGivern e65ba684bc Merge branch 'zj-chat-message-pretty-time' into 'master'
Convert seconds to minutes and hours on chat notifations

See merge request !11054
2017-05-04 08:25:02 +00:00
Alfredo Sumaran b64a37c4ed Allow to create new branch and empty WIP merge request from issue page 2017-05-04 08:09:21 +00:00
Z.J. van de Weg 5d4183e58d Convert seconds to minutes and hours on chat notifations
In the pipeline message, the duration of the pipeline was shown as:

> gitlab-org/gitlab-ee: Pipeline #8002259 of master branch by Douwe Maan
failed in 8612 seconds

But this many seconds only gave me a clue how long the pipeline took,
so now this will be shown as something like: 02:20:12 which gives a much
better measure of time.
2017-05-04 08:39:06 +02:00
blackst0ne 154610c92b Fix feature tests 2017-05-04 14:54:25 +11:00
blackst0ne aaa70a62b0 Add comment to notes aliases 2017-05-04 12:58:41 +11:00
blackst0ne 62be3355b1 Add alias_attributes for notes 2017-05-04 12:58:41 +11:00
blackst0ne 7ad5a1b371 Add last_edited_at and last_edited_by attributes 2017-05-04 12:58:41 +11:00
blackst0ne 323596f68e Add system note on description change of issue/merge request 2017-05-04 12:58:41 +11:00
Douwe Maan 4faa65d838 Merge branch '31671-merge-request-message-contains-carriage-returns' into 'master'
removes the possibility of commit messages having carriage returns

Closes #31671

See merge request !11077
2017-05-03 22:25:50 +00:00