CE upstream

@grzesiek Please fix test ./spec/workers/pages_worker_spec.rb:30 (https://gitlab.com/gitlab-org/gitlab-ee/builds/516839) as I think it's related to your commit https://gitlab.com/gitlab-org/gitlab-ce/commit/504696453bb7d89278bf021393274e475b84ebbd or at least you know this code :)

@vsizov Sure. It looks like this is a issue with remove order. We have CommitStatus, Ci::Commit and Ci::Build that inherits from CommitStatus. We have then dependent: :destroy in each of those models and the problem is that when removing a Project, Ci::Commit gets removed before Ci::Build, but build depends on Ci::Commit while removing -- but at this point it is nil.

Removing dependent: :destroy on CommitStatus solves this issue. It will eventually get removed when processing destroy callback on Ci::Commit but only when all CommitStatuses are associated with Ci::Commit, but I'm not sure if this is true. Need to ask @ayufan before pushing fix.

This issue also affects CE, probably from a long time, but it got exposed now, when new specs for GitLab Pages that exercise Project removal where added. We need to add additional specs for destroying Project in CE also.

We had a call with @ayufan and it looks like we experience timing issues while removing project. This needs to be fixed using - for example - before_destroy callback. We need to fix that as soon as possible and then introduce mechanism that will migrate all CI files to proper directory.

@grzesiek @ayufan OK, but when can we expect this test fixed? I mean, if it takes too long I would rather comment that test out, so we will keep CE and EE synced.

I mean, we can wait for a few days.

@vsizov We will prepare MR in CE that solves this issue shortly.

mentioned in commit jt-gitlab/gitlab-ce@db2d067e

mentioned in commit jt-gitlab/gitlab-ce@8b39b8cd

mentioned in commit f89db395

mentioned in commit jt-gitlab/gitlab-ce@f89db395

Deleted source branch ce_upstream

@vsizov should we close this MR?

Restored source branch ce_upstream

WOW, I pressed "Remove source branch" in the old MR and it removes it here. I just forgot that I called branch the same. Anyway, I just recovered the branch.

@dzaporozhets No, it should not be closed, because it contains my work actually :)

@grzesiek I guess you've already fixed the problem in CE side?

@vsizov Yes, it is fixed in CE since a few days, and fix has been also picked into 8-3-stable.

@rspeicher @yorickpeterse We can just merge new EE and CE masters code to this branch since I resolved lots of conflicts here (conflicts of one week).

@vsizov thanks.

Can someone update branch with recent CE upstread and get it merged? @vsizov is busy this week with important task

It may require the EE master to be merged as well.

@dzaporozhets @vsizov I'll merge CE master into this branch.

@yorickpeterse thanks!

mentioned in commit db2d067e

mentioned in commit 8b39b8cd

Added 326 commits:

4f0a38f1 - Added housekeeping for git repositories
c843722d - Add graphs showing commits ahead and behind default to branches page
860e24cc - Merge branch 'master' into diverging-branch-graphs
e0c64fac - Refactor for style issues
64ca9cf3 - Merge branch 'master' into diverging-branch-graphs
839aae0e - Added housekeeping status and moved path check to gitlab-shell
d4690af8 - Use GitlabShellWorker.perform_async for housekeeping
932a7fd9 - Merge branch 'master' into diverging-branch-graphs
c12514fc - Ignore config/sidekiq.yml [ci skip]
2e8ec7e7 - Fix diverging commit count calculation
b45ee2c3 - better support for referencing and closing issues in asana_service.rb
331154ff - Escape reference link text
989131c5 - Render milestone links as references
676678e5 - Link to milestone in "Milestone changed" system note
88c35095 - Add changelog item
0ca74f7a - Use to_reference in system notes.
32543f3b - More escaping!
ef8b1dbf - Merge branch 'master' into milestone-ref
7dedd997 - Merge branch 'master' into milestone-ref
bd21e3d7 - Add Open Graph data for group, project and commit.
a7756a4b - Add specs for page_image using a Group's avatar
dcca64a5 - Use assign instead of instance_variable_set
141b8b67 - Make single user API endpoint return Entities::User instead of Entities::UserBasic
eb162c2b - adds settings menu to the top for editting and leaving projects
8ee6abaa - fixes tests failing
c6c96708 - Merge branch 'master' into improved-leave-project
d985d08a - adds proper it for multi line. adds find with correct id for button.
dddb54f0 - Fix link, filename and crosslink to omnibus docs.
2cd2c54b - Update Asana field descriptions
12ec1e3c - Update Asana service to work with Personal Access Token, lessen number of requests to Asana API
4c1f1c2c - Update Asana specs
e8080fc8 - Fix error in Asana service
d67f697d - Merge remote-tracking branch 'origin/master' into better-asana-refs
6eb273a1 - Restore colon in Asana comment
7b98d0e1 - Update Asana service documentation
9e7a88f0 - Better handling of errors in Asana service
d9d2e8a3 - Support a single directory traversal in RelativeLinkFilter
a6c60127 - Removed tracking of raw SQL queries
55ed6e1c - Cache InfluxDB settings after the first use
bd9f86bb - Use separate series for Rails/Sidekiq transactions
cafc784e - Removed tracking of hostnames for metrics
90029a5c - Actually test the posted comment in Asana service
571df5f4 - Use execute in Asana specs
cf4ccdda - Merge remote-tracking branch 'upstream/master' into better-asana-refs
c80f75ea - Give the logo shapes meaningful IDs
e5800d65 - Use the logo as a loading indicator
71c31ecf - Ensure the sweep always starts from the left
fd178c1e - Prevent duplicate "username has already been taken" validation message
086cfc86 - Fix API project lookups when querying with a namespace with dots
8bfc4645 - Show 'New Merge Request' buttons on canonical repo.
95e6327b - Fix tests
796c11e9 - Remove feature tag from testing locally
edd2ce38 - Change text back. Add additional tests.
96075be6 - Ability to increment custom transaction values
66a997a9 - Track total query/view timings in transactions
825b46f8 - Track total method call times per transaction
2ea464bb - Use separate series for Rails/Sidekiq sample stats
2ee8f555 - Automatically prefix transaction series names
567dc62b - Show 'All' tab by default in the builds page
8de491a6 - Fix Rubocop styling in AR subscriber specs
4b027bc9 - Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue.
712af98e - removes footer message about access to project
770517d3 - Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'"
bb6b793c - Don't log backtrace in Asana service
61805603 - rempves tests for "you have master access" text
7e034a7f - Merge branch 'reverting-rs-remove-jquery-blockui' into 'master'
e586492e - Merge branch 'rs-issue-201' into 'master'
ad42441d - Remove jquery.blockUI.js plugin
ce4c38b3 - Merge branch 'debug-banzai-cache' into 'master'
12ce1cbf - Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification
10a9751a - Update CHANGELOG
6f4ea679 - Merge branch 'show-all-builds-by-default' into 'master'
7df3c1e8 - Correct the logo ID names
9f46ca44 - Decrease the logo sweep delay
567d87d9 - Restructure logo JS to use setInterval
93096247 - Don't notify users twice if they are both project watchers and subscribers
b807a23b - Redesign the AbuseReports index
0e60282e - Redirect back to user profile page after abuse report
01248d20 - Make AbuseReportMailer responsible for knowing if it should deliver
46a220ae - Add AbuseReport#notify
b079e165 - Merge branch 'rs-abuse-reports' into 'master'
53d6bca8 - Merge branch 'rs-remove-jquery-blockui' into 'master'
b779111d - Merge branch 'dedupe-notifications-watcher-and-subscriber' into 'master'
525f8fb4 - Merge branch 'rs-logo-animation' into 'master'
99148939 - Merge branch 'metrics-tuning' into 'master'
e6713cd9 - Merge branch 'improved-leave-project' into 'master'
7f2127ee - Merge remote-tracking branch 'origin/crosslink-env-docs'
aa3c7219 - Merge branch 'fix-api-lookup-with-usernames-with-dots' of https://gitlab.com/stanhu/gitlab-ce
f7ba38c0 - markdown fixes
00e8532d - markdown fixes
a31d2f2a - Merge branch 'new-markdown' into 'master'
d17945bb - Remove misleading ssh-dsa
ca8639a4 - Clarify the key generation step
766a5963 - Fix grammar
2459d516 - Merge branch 'ssh-doc-fixes' into 'master'
57a68c72 - Update project services to include all supported ones
6ce01ca3 - Validate README format before displaying
e57b5062 - Suggest prefacing find command with sudo when base permissions are wrong
8e33ec1d - [ci skip] Update CHANGELOG
a7c42451 - Merge branch 'rs-relative-links-to-root' into 'master'
2479af4d - Merge branch 'pr-9938' into 'master'
9b127028 - Merge branch 'rs-abuse-reports-refactor' into 'master'
7c3c901a - Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master'
097faeb4 - Get "Merge when build succeeds" to work when commits were pushed to MR target br…
0bab4788 - Satisfy Rubocop
7a3b7629 - Merge branch 'master' into more-opengraph
fd91b48f - Merge branch 'master' into milestone-ref
07c39c99 - Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master'
0b661516 - Remove icon from milestone reference.
8de1f715 - Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master'
b5414463 - Fix notification spec
95f1fe72 - Import GitHub Pull Requests into GitLab
223f7f53 - Import comments on GitHub Pull Request into GitLab
f19bf0ea - Import comments on the diff of a GitHub Pull Request into GitLab
d72b2581 - Doesn't import GitHub PR where branches were no longer available
6c846ef8 - Extract methods to import comments on a GitHub Pull Request
dc72a8b3 - Refactoring GithubImport::Importer
98909dd1 - Generate separate comments when importing GitHub Issues into GitLab
2dc74b48 - Update CHANGELOG
837a9065 - Ensure that we're only importing local pull requests
e194b962 - Update doc for importing existing GitHub projects to GitLab
8393e3e0 - Add missing changelog entry
045e8cc3 - Update version check images to use SVG
db2d067e - Fix project destroy callback
a298f694 - Use User#avatar_url instead of avatar_icon helper
43053c2e - Make page_description less magical
a0793d69 - Remove now-redundant page_description call from Projects#show
67a927ff - Merge branch 'rs-version-check-svg' into 'master'
6d3b5ea2 - Remove now-redundant page_description call from Groups#show
d453b24a - Merge branch 'validate-readme-format' into 'master'
1e6fc0c6 - Define a limited set of filters for SingleLinePipeline
52e41dca - Fix the abuse report detail URL in the HTML email template
dec42e42 - Merge pull request #9912 from pmq20/psvr/dec15
797c2326 - Merge branch 'feature/detailed-user-endpoint' of https://gitlab.com/Michi302/gitlab-ce
f6b61d19 - Merge branch 'rs-fix-abuse-report-url' into 'master'
987989b6 - Remove block button on abuse reports if user is already blocked
e16d9edf - Show that user is already blocked on Abuse Reports
384445ec - Don't override issue page description in project layout.
95b1adb3 - Merge branch 'fix-notification-spec' into 'master'
c0849101 - Merge branch 'master' into merge-when-build-succeeds-unchecked
639d4280 - Merge branch 'master' into more-opengraph
2474a592 - Merge branch 'master' into milestone-ref
b9ed3961 - Revert "Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue."
cf19efec - Revert "Temporarily disable Markdown caching"
37ce5f31 - Fix mentionable reference extraction caching.
18b17072 - Add regression test.
7884a261 - Merge branch 'import-gh-pull-requests' into 'master'
8b39b8cd - Merge branch 'fix/project-destroy-callbacks' into 'master'
79c0e721 - Annotate models
da53fcba - Enable Microsoft Azure OAuth2 support
9b28220f - Merge gitlab.com:gitlab-org/gitlab-ce
fe191698 - Use panel-default and .form-actions
0b2fa3bf - Fix problem with projects ending with .keys #3076
bde76f62 - Added CHANGELOG for housekeeping and changed GITLAB_SHELL_VERSION to 2.6.10
7549102b - Store SQL/view timings in milliseconds
fc386b65 - Merge branch 'azure_oauth2' into 'master'
bcd2a09d - Merge branch 'metrics-milliseconds' into 'master'
8fdc00bd - Remove InfluxDB username/password
623fa2ca - Merge branch 'fix-banzai-cache' into 'master'
6865d3e5 - Merge branch 'rs-issue-1697' into 'master'
b93744e3 - Merge branch 'merge-when-build-succeeds-unchecked' into 'master'
d47b3e63 - Merge branch 'more-opengraph' into 'master'
12e32224 - Add documentation on enabling/disabling GitLab CI
7d013f78 - Fix missing date of month in network graph when commits span a month
a8e23bd1 - Fix hyphenation typos [ci skip]
ee9432a7 - Merge branch 'remove-influxdb-credentials' into 'master'
0deeebc1 - Merge branch 'doc_enable_disable_ci' into 'master'
88845053 - Add new feature to find file
7ed3a5a2 - Revert "Store SQL/view timings in milliseconds"
b38eabda - Fix changelog
539b4192 - Milestone reference is a Markdown link
da912c8f - Merge branch 'revert-influxdb-milliseconds' into 'master'
364b07cf - Removed UUIDs from metrics transactions
5c7de851 - Merge pull request #9889 from koreamic/file_finder
41b8a238 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
09216e8b - Merge branch 'master' of github.com:gitlabhq/gitlabhq
15d689ab - Credit koreamic for creating Find File
7b10cb6f - Store request methods/URIs as values
8d0886d6 - Merge branch 'fix-missing-day-in-network-graph' into 'master'
3b04268f - Merge branch 'use-sudo-with-incorrect-base-permissions' into 'master'
1886d727 - Add API project upload endpoint
706d7eb0 - Satisfy Rubocp
1695063d - Merge gitlab.com:gitlab-org/gitlab-ce
892d5dbb - Update Gemfile.lock
9f268708 - Merge branch 'find-file-credit' into 'master'
61561a9e - Merge branch 'remove-more-influxdb-tags' into 'master'
7a240397 - Added an index on milestones.title
9dacc3bc - Sort by ID when sorting using "Recently created"
0d0049c0 - Don't pluck IDs when getting issues/MRs per group
fc443ea7 - Drop projects order in IssuableFinder
5dc708e1 - Updated Gemfile.lock due to Bundler re-ordering
9b0c360b - Fixed issue sorting specs for ID changes
9a250ad6 - Filter commits by search parameter
5e93f912 - Add search field to commits page
d1a40e06 - Add ajax filtering for commits list
04568559 - Add CHANGELOG item and tests
b2b4e9a7 - Prevent loading first 20 commits twice
4443a5f3 - Add support for ref and path to commits filtering
44dc9aa6 - Fix typo in js method and some repeating css
c7fc84f5 - Use fadeTo instead of css
8386edaf - Accept 2xx status codes for successful Web hook triggers
19a0db30 - Removed ORDER BY in "of_group" scopes
1e927d39 - Update spec
c3865bda - Properly set task-list class on single item task lists
79938744 - Merge branch 'master' into task-list-class
0d59e7b9 - Merge branch 'ajax-filter-commits' into 'master'
8f6ca700 - fixes ajax issue with issue spec
df18441e - changes titles
aacda082 - Merge branch 'ajax-issues-fix' into 'master'
3c93e588 - Merge branch 'annotate-models-20160105' into 'master'
ad8366ed - css change to height to make gray container fit
69209612 - Suppress e-mails on failed builds if allow_failure is set
90510f00 - Merge branch 'milestone-ref' into 'master'
87000b25 - Merge branch 'gemfile-lock' into 'master'
b1539116 - Merge branch 'task-list-class' into 'master'
60aedb46 - adds reference to the bottom of sidebar
a652c563 - adds 85% width for text
65308a9c - Add spec for single-item task lists
59305715 - Remove stamp gem
f7fdcb95 - Do not call API if there is no API URL
fa36749b - Add two custom Date/Time conversion formats
63444936 - Use to_s(:iso8601) where appropriate
4408dc0b - Use xmlschema where even more appropriate!
09dbe375 - Fix feature step
3c58b89b - Give credit to user who created find file feature
e78ddb09 - Merge branch 'give-credit-to-kaiser-soze' into 'master'
423d2d62 - Fix duplicated branch creation/deletion events when using Web UI
4c90ed52 - Delete tag via API
8f7c7bf6 - Merge branch 'rs-remove-stamp' into 'master'
c3c0dda3 - Blacklist 'new'
e4411a96 - Merge branch 'docs_project_services' into 'master'
b059fa55 - Clean up integration README
45aea8c7 - Merge branch 'banner-out-of-place' into 'master'
68eab8b2 - Merge branch 'cross-project-reference-move' into 'master'
26a54ec3 - Merge branch 'sorting-dropdown-order' into 'master'
08213ed4 - Merge branch 'accept-2xx-status-codes-for-webhooks' into 'master'
629becde - Split external issue tracker document
1d48b180 - Clean up the JIRA integration document [ci skip]
fc7b14a5 - Remove reference to EE from JIRA service model
2c37ae2f - Merge gitlab.com:gitlab-org/gitlab-ce
8d7a968d - Handle missing DBs in connect_to_db?
b64ec38a - Merge branch 'api-delete-tag' into 'master'
ec4a4f06 - Merge branch 'current-settings-handle-missing-db' into 'master'
d09f1a44 - Remove useless assignment to variable
65c47499 - Add JIRA 7 to the supported versions
255a6356 - Merge branch 'docs_project_services' into 'master'
c1e974ed - Merge branch 'issue_3076' into 'master'
cb22e5f9 - Load autocomplete data when loading an issue page
e0436005 - Merge gitlab.com:gitlab-org/gitlab-ce
8429f6f4 - Merge branch 'rs-single-item-task-list-spec' into 'master'
0614793b - DRY up upload and download services
7403df6c - Merge branch 'suppress-allow-failure-builds' into 'master'
46390592 - fixes new branch button positioning, when visible and not visible container
b284ba24 - changes verb references to noun reference.
6467448a - Merge branch 'blacklist-new' into 'master'
af68897a - Merge branch 'api-project-upload' into 'master'
99eb6470 - Add a CHANGELOG entry for The Most Important Feature of All Time(TM)
00a68c3c - Remove Block Button from Abuse Reports page if User is Already Blocked
6d954441 - Merge branch 'cross-project-reference-typo-fix' into 'master'
d5c8f1fd - Fix caching issue where build status was not updating in project dashboard
89ca4f04 - Refactor ZenMode
11b4c0d3 - Clean up document on adding users to a project
c81647ae - Merge branch 'doc_clean_up_add_users' into 'master'
c7aeca99 - Use WOFF versions of SourceSansPro
a8b44495 - Add CHANGELOG entry for reply-by-email fix
5f6b0934 - Disable "Already Blocked" button in admin abuse report page
be76e402 - Merge branch 'disable-blocked-in-abuse-reports' into 'master'
e6dbbafd - Update docs for shared runner default settings
9061b55c - Fix typo in build page of projects
efaa4e23 - Merge branch 'update-changelog-with-email-reply-fix' into 'master'
4de89291 - Merge branch 'fix_jira_shortterm' into 'master'
70cba8e9 - Remove outdated gitlab-git-http-server reference from Install doc
0f2e4198 - Add versions to omniauth_crowd and omniauth-azure-oauth2
4b4fdf58 - Fix Error 500 when visiting build page of project with nil runners_token
b7aa13a0 - Before project save ensure that a runners_token exists
a789dcae - use JavaScript instead of CoffeeScript in Views, the reason #9819
e304a76e - Issue #5817 wording of the web hooks updated on issue and merge events
af9bbadc - Merge branch 'check-for-present-runner-token' into 'master'
8aac39d8 - Add pencil icon to edit group settings
f394ccd5 - Merge branch 'Issue#5817' into 'master'
1587d571 - Check for current user
706255b9 - Merge gitlab.com:gitlab-org/gitlab-ce
17f6a916 - Merge branch 'master' into 'master'
e04e957b - Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/gitlab-ce
e3c024f7 - Merge branch 'add-pencil-icon-to-group-page' into 'master'
e9f84c4c - Merge branch 'new-branch-position-fix' into 'master'
ce066ba6 - Merge branch 'autocomplete-on-load' into 'master'
569f5701 - Only load autocomplete data when actually needed
5270cc69 - Merge branch 'doc-update' into 'master'
31b66aa7 - Generate builds when creating tag using web interface
b6c2908c - Merge branch 'fix-build-page-typo' into 'master'
57a4319d - Merge branch 'load-autocomplete-when-needed' into 'master'
13c35622 - Use gitlab-workhorse 0.5.3
f41b535c - Merge branch 'fix-build-status-caching' into 'master'
cdd3a806 - Allow subsequent validations in CI Linter
d89ad507 - Merge pull request #9960 from huacnlee/fix/do-not-use-coffeescript-in-erb
66dee188 - Merge branch 'rs-zenmode-cleanup' into 'master'
a9800ce4 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
67aa0b8c - Optimize LDAP and add a search timeout
1ede18bf - Merge branch 'rs-woff-fonts' into 'master'
5500f915 - Merge branch 'group-issues-sorting' into 'master'
701e9ee4 - Merge branch 'rs-omniauth-client-versions' into 'master'
35b501f3 - Tag all transaction metrics with an "action" tag
e34c621e - Bump fog to 1.36.0
0f113828 - [ci skip] Fixed minor typo in docker documentation
d65e7aa9 - Merge branch 'add-action-to-all-metrics' into 'master'
49f51ff1 - Merge branch 'optimize_ldap' into 'master'
5d63ad21 - Merge branch 'gitlab-workhorse-0.5.3' into 'master'
b3431a8c - adds hover titles to merge request and issue pages
5dad714d - Merge branch 'fix-ci-builds-for-tags' into 'master'
6fc1aba4 - Merge branch 'fix/ci-linter-sequence-validations' into 'master'
f2fab27a - Update CHANGELOG
9bea7efb - changes bolded on active for dropdowns, sitewide.
21a46236 - Add title attribute to Emojis in award picker
d4ffe705 - Call clearInterval for the currentTimer if one exists
68d00764 - Merge branch 'rs-clear-current-timer' into 'master'
3ea637ed - Merge branch 'typo-fix' into 'master'
ae7de2f8 - Remove the :coffee and :coffeescript Haml filters
7929fe05 - Merge branch 'rs-remove-coffee-filters' into 'master'
f0450c48 - Merge branch 'rs-add-title-to-emoji' into 'master'
93a8c981 - Merge branch 'active-state-on-button-makes-it-uppercase' into 'master'
af7f0a4d - Merge branch 'hover-descriptions' into 'master'
c4511a12 - Merge branch 'update-fog' into 'master'
9f8510b3 - Updated CHANGELOG with changes I made
587f8501 - Merge branch 'changelog-metrics' into 'master'
d92f4de1 - Merged GitLab CE commit 587f85

Merged everything up to CE commit 587f850170a38e2642c0de76fb69efdeae930d66 into this branch, lets hope I didn't break everything.

Added 13 commits:

0134a85b - added make command to docs
7a22b6b0 - Improve button styles
75123458 - Add user's last used IP addresses to admin page
c3049883 - Merge branch 'improve_button_styles' into 'master'
e85faec9 - Merge branch 'show-ip-addresses' into 'master'
5679ee01 - Track memory allocated during a transaction
0e769d2a - Use gitlab-workhorse 0.5.4
355c341f - Stop tracking call stacks for instrumented views
6992b072 - Merge branch 'allocated-memory-per-transaction' into 'master'
8f1c46d1 - Merge branch 'add_make' into 'master'
83ad5fa5 - Merge branch 'remove-application-frames-from-views' into 'master'
9cbdc2d8 - Merge branch 'gitlab-workhorse-0.5.4' into 'master'
46bfd85d - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream

Added 6 commits:

fac252c9 - Never heard of gitlab-omnibus
1c46ab04 - Add CHANGELOG entry for 8.3.4
025f0617 - Merge branch 'gitlab-omnibus-really' into 'master'
d047db91 - Merge branch 'changelog-8.3.4' into 'master'
6cd67753 - Merge remote-tracking branch 'ce/master' into ce_upstream
78f25f66 - Convert two inline coffeescript filters to javascript

Added 2 commits:

ba3657b4 - Fix time_ago_with_tooltip spec
fcefa8dc - Update Gemfile.lock

Added 8 commits:

fcefa8dc...dd2e7626 - 6 commits from branch master
02779b47 - Merge branch 'master' into ce_upstream
e00ffce1 - Missed one inline coffeescript filter

Added 3 commits:

e67d14e1 - Revert "Missed one inline coffeescript filter"
f0c30140 - Revert "Remove the :coffee and :coffeescript Haml filters"
a5449811 - Revert "Convert two inline coffeescript filters to javascript"

Added 16 commits:

97022c41 - Improve admin area button style
75180eae - Change milestone close notice copy. Closes #6051
0c598004 - Revert group milestone copy
f225c2a0 - Merge branch 'improve_more_buttons' into 'master'
5c874f06 - Merge branch 'change_milestone_close_copy' into 'master'
b0145d76 - Revert "Remove the :coffee and :coffeescript Haml filters"
c2b3dd17 - Never heard of gitlab-omnibus
52acf41a - Add CHANGELOG entry for 8.3.4
1ec9ab26 - Fix time_ago_with_tooltip spec
753e0f51 - Update Gemfile.lock
07b8d25d - Improve weight icon
34cc7cd8 - Fix error with file size check with submodules
100e15bf - Update LICENSE copyright notice to 2016
cbaceb77 - Update CHANGELOG
8c67a9fb - Merge branch 'rs-revert-remove-filters' into 'master'
2ba660e4 - Merge remote-tracking branch 'ce/master' into ce_upstream

Builds were green after I removed all the Coffeescript filter garbage, so I rebased to remove those commits and reverts, force pushed, and we should be good for now.