delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Fix a missed rename	Lin Jen-Shin	2016-05-20	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Rename reply_key to mail_key	Lin Jen-Shin	2016-05-20	2	-11/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Actually there's no such case	Lin Jen-Shin	2016-05-20	1	-9/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Give ProjectNotFound when the project is not readable	Lin Jen-Shin	2016-05-18	3	-6/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix some styling offender	Lin Jen-Shin	2016-05-18	3	-5/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	so we use separate classes to handle different tasks	Lin Jen-Shin	2016-05-18	8	-179/+240
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	We should totally cache it	Lin Jen-Shin	2016-05-16	1	-3/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Report better errors. TODO: Enable skipped test	Lin Jen-Shin	2016-05-16	3	-7/+31
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Now we would be validating authentication token	Lin Jen-Shin	2016-05-16	1	-3/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Create a new issue via: incoming+group/project+AUTH_TOKEN@...	Lin Jen-Shin	2016-05-16	5	-4/+54
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	process_reply -> process_create_note; handle_reply -> process_reply	Lin Jen-Shin	2016-05-16	1	-5/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update wording because we're overloading UserNotAuthorizedError	Lin Jen-Shin	2016-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	bang to indicate that this method could raise an exception	Lin Jen-Shin	2016-05-16	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update style as create_note	Lin Jen-Shin	2016-05-16	1	-3/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	No need to check project because:	Lin Jen-Shin	2016-05-16	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sent_notification.project would never be nil, and we also have already checked message_project before entering process_create_issue.
\| * \| \| \| \| \| \| \|	Handle InvalidIssueError as InvalidNoteError	Lin Jen-Shin	2016-05-16	1	-1/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Raise one by one instead of if checks	Lin Jen-Shin	2016-05-16	1	-10/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Alloy empty reply for new issues, but not response	Lin Jen-Shin	2016-05-16	3	-4/+36
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Try to give better names	Lin Jen-Shin	2016-05-16	1	-6/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	enable Style/MethodDefParentheses and fix parentheses	Lin Jen-Shin	2016-05-16	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add another TODO that we need to verify identity better	Lin Jen-Shin	2016-05-16	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Implement #3243 New Issue by email	Lin Jen-Shin	2016-05-16	3	-29/+147
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So we extend Gitlab::Email::Receiver for this new behaviour, however we might want to split it into another class for better testing it. Another issue is that, currently it's using this to parse project identifier: Gitlab::IncomingEmail.key_from_address Which is using: Gitlab.config.incoming_email.address for the receiver name. This is probably `reply` because it's used for replying to a specific issue. We might want to introduce another config for this, or just use `reply` instead of `incoming`. I'll prefer to introduce a new config for this, or just change `reply` to `incoming` because it would make sense for replying to there, too. The email template used in tests were copied and modified from: `emails/valid_reply.eml` which I hope is ok.
\| * \| \| \| \| \| \| \|	Fix a typo	Lin Jen-Shin	2016-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2016-07-28	5	-13/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'20308-fix-title-that-is-show-in-the-dropdown-toggle-button-on-projects-branches' into 'master' Fix the title of the toggle dropdown button ## What does this MR do? Fix the dropdown-button toggle displaying the correctly title. ## Are there points in the code the reviewer needs to double check? See if the title is displaying correctly and if the code is acceptable. ## Why was this MR needed? When you choose `Last updated` it should display the title `Last updated` instead of `Recently updated`. This fix makes this correctly displays the title. ## What are the relevant issue numbers? Closes #20308. ## Screenshots (if relevant) ![filter-gitlab-ce](/uploads/52838679d134d57c6ff6120260806fda/filter-gitlab-ce.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5515
\| * \| \| \| \| \| \| \| \|	Fix the title of the toggle dropdown button	Herminio Torres	2016-07-28	5	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before when you choose the way of `sort` instead it display the title correctly it was just apply the humanize helper in sort value. E.g. When you choose `Last updated` it should display the title `Last updated` instead of `Recently updated`. This fix makes this correctly displays the title. Change the implementation of the `link_to` `filter_branches_path` - Change the value of the `params[:sort]` in `link_to`. E.g. instead of using `'recently_updated'` is now using `sort_value_recently_updated`. - Change the values of the case in the `branches_sorted_by` method for the values it receives in the `params[:sort]` that are: `nil`, `'name'`, `'updated_desc'`, `'updated_asc'`.
* \| \| \| \| \| \| \| \| \|	Merge branch 'reduce-instrumentation-overhead' into 'master'	Rémy Coutable	2016-07-28	10	-54/+50
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce instrumentation overhead ## What does this MR do? This MR reduces the overhead of instrumented methods. See the commit message of 905f8d763ab1184dc0b1e4bf6f18d7981753a860 for more information. ## Are there points in the code the reviewer needs to double check? Not that I can think of. ## Why was this MR needed? The overhead of method call instrumentation was too great. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5550
\| * \| \| \| \| \| \| \| \| \|	Reduce instrumentation overhead	Yorick Peterse	2016-07-28	10	-54/+50
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reduces the overhead of the method instrumentation code primarily by reducing the number of method calls. There are also some other small optimisations such as not casting timing values to Floats (there's no particular need for this), using Symbols for method call metric names, and reducing the number of Hash lookups for instrumented methods. The exact impact depends on the code being executed. For example, for a method that's only called once the difference won't be very noticeable. However, for methods that are called many times the difference can be more significant. For example, the loading time of a large commit (nrclark/dummy_project@81ebdea5df2fb42e59257cb3eaad671a5c53ca36) was reduced from around 19 seconds to around 15 seconds using these changes.
* \| \| \| \| \| \| \| \| \|	Merge branch 'add_commit_stats' into 'master'	Rémy Coutable	2016-07-28	4	-0/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add commit stats ## What does this MR do? When getting commit by SHA in api it returns commit stats ## Are there points in the code the reviewer needs to double check? Not sure about test I added do we need separate test or we can just shove stats assertion in test above ## Why was this MR needed? So api users/clients can get statistics on single commit ## What are the relevant issue numbers? #20307 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5517
\| * \| \| \| \| \| \| \| \| \|	Add commit stats to commit api response	dixpac	2016-07-28	4	-0/+15
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'update_guide' into 'master'	Valery Sizov	2016-07-28	1	-0/+191
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added update guide for 8.11 ## What does this MR do? I need to add notes about Elastic on EE side. To not create ugly conflicts in the future and to not duplicate work I created it here first. I followed this guide https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#gitlab-ce See merge request !5545
\| * \| \| \| \| \| \| \| \|	Added update guide for 8.11	Valery Sizov	2016-07-28	1	-0/+191
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'rename-undefined-methods' into 'master'	Robert Speicher	2016-07-27	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace reject_blocked with reject_blocked! in skipped callbacks. `reject_blocked!` was introduced in c9def945, I can't find any references to `reject_blocked` ever existing. See merge request !5532
\| * \| \| \| \| \| \| \| \|	Replace reject_blocked with reject_blocked! in callbacks.rename-undefined-methods	Connor Shea	2016-07-27	3	-3/+3
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Rails 4.2 and below, skipping callbacks (skip_before_action, skip_after_action, etc.) that use methods which do not exist will not throw any errors. On the other hand, Rails 5 does. See https://github.com/rails/rails/pull/19029 After testing with Rails 5 I noticed there are some methods that don't actually exist (because they were renamed, usually), this fixes a few instances of those. reject_blocked! was introduced in c9def945d4222eeb8026a0311495259bf99267a1, I can't find any references to reject_blocked ever existing.
* \| \| \| \| \| \| \| \|	Merge branch 'akismet-ui-check' into 'master'	Douwe Maan	2016-07-27	12	-35/+122
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Submit new issues created via the WebUI or API to Akismet for spam check on public projects. ## What does this MR do? Submit new issues created via the WebUI by non project members to Akismet for spam check. ## Why was this MR needed? Support for Akismet was added only to the API with !2266. This MR builds on that functionality to also check issues submitted via the WebUI for spam. ## What are the relevant issue numbers? Related to: - #5573 - #5932 - gitlab-com/infrastructure#14 - gitlab-com/support#61 - !2266 cc @stanhu @MrChrisW See merge request !5333
\| * \| \| \| \| \| \| \| \|	Refactor spam validation to a concern that can be easily reused and improve ↵akismet-ui-check	Patricio Cano	2016-07-26	9	-44/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	legibility in `SpamCheckService`
\| * \| \| \| \| \| \| \| \|	Refactor `SpamCheckService` to make it cleaner and clearer.	Patricio Cano	2016-07-26	6	-39/+38
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Submit all issues on public projects to Akismet if enabled.	Patricio Cano	2016-07-26	9	-36/+54
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Submit new issues created via the WebUI by non project members to Akismet ↵	Patricio Cano	2016-07-26	6	-13/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for spam check.
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/requests-profiles-controller-does-not-catch-certain-files'	Douwe Maan	2016-07-27	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Change requests_profiles resource constraint to catch virtually any filefix/requests-profiles-controller-does-not-catch-certain-files	Ahmad Sherif	2016-07-27	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'cs-upgrade-attr-encrypted' into 'master'	Robert Speicher	2016-07-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update attr_encrypted from 3.0.1 to 3.0.2 This removes methods that were deprecated by Rails 5 so we won't have as many deprecation warnings when we update to Rails 5. Working toward #14286. Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.md#302 See merge request !5438
\| * \| \| \| \| \| \| \| \| \| \|	Update attr_encrypted from 3.0.1 to 3.0.3cs-upgrade-attr-encrypted	Connor Shea	2016-07-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes methods that were deprecated by Rails 5. Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.md#303
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'cs-upgrade-rack-oauth2' into 'master'	Robert Speicher	2016-07-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rack-oauth2 from 1.2.1 to 1.2.3. Removes methods deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/nov/rack-oauth2/compare/v1.2.1...v1.2.3 See merge request !5439
\| * \| \| \| \| \| \| \| \| \| \| \|	Update rack-oauth2 from 1.2.1 to 1.2.3.cs-upgrade-rack-oauth2	Connor Shea	2016-07-22	1	-1/+1
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes methods deprecated in Rails 5. https://github.com/nov/rack-oauth2/compare/v1.2.1...v1.2.3
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'cs-upgrade-bullet' into 'master'	Robert Speicher	2016-07-27	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Bullet from 5.0.0 to 5.2.0 Removes methods that were deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md#520-07262016 See merge request !5443
\| * \| \| \| \| \| \| \| \| \| \| \|	Upgrade Bullet from 5.0.0 to 5.2.0.cs-upgrade-bullet	Connor Shea	2016-07-26	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes methods that were deprecated in Rails 5. Changelog: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md#520
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'cs-upgrade-gon' into 'master'	Robert Speicher	2016-07-27	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade gon from 6.0.1 to 6.1.0. Removes methods that were deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9 See merge request !5442
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade gon from 6.0.1 to 6.1.0.cs-upgrade-gon	Connor Shea	2016-07-22	2	-4/+4
\| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes methods that were deprecated in Rails 5. Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'cs-upgrade-default-value-for' into 'master'	Robert Speicher	2016-07-27	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade default_value_for from 3.0.1 to 3.0.2. Includes support for Rails 5. Working toward #14286. Changelog: https://github.com/FooBarWidget/default_value_for/compare/release-3.0.1...release-3.0.2 See merge request !5441
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade default_value_for from 3.0.1 to 3.0.2.cs-upgrade-default-value-for	Connor Shea	2016-07-22	1	-2/+2
\| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Includes support for Rails 5. Changelog: https://github.com/FooBarWidget/default_value_for/compare/release-3.0.1...release-3.0.2