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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-typo-in-user-steps' into 'master'	Rémy Coutable	2016-05-04	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in user steps feature file Just came across a typo in the user steps file. See merge request !3943
\| *	Fix typo in user steps feature	Karlo Soriano	2016-04-27	1	-1/+1
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'doc-fix-db-gem-install-instructions' into 'master'	Rémy Coutable	2016-05-04	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update patch_versions.md with explicit --with statement for db gem group ## What does this MR do? Updates `patch_versions.md`'s instructions on installing gems to explicitly install either the postgres or mysql groups. ## Are there points in the code the reviewer needs to double check? No, but thank you for your time. ## Why was this MR needed? I performed the steps listed in `patch_versions.md` and ran the command for updating postgres gems. Bundler told me at the end that it had not installed the postgres gem group, which caused the next step, migrating the DB, to fail for obvious reasons. Changing the command to `--with postgres` made it install the postgres gem group, and db:migrate then passed. ## What are the relevant issue numbers? None ## Screenshots (if relevant) N/A See merge request !3955
\| * \|	Add explicit --with statement for postgres and mysql gem groups as ↵	mike	2016-04-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	necessary. When I followed these instructions, the first command did not install the postgres group and it had to be made explicit.
* \| \|	Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'	Douwe Maan	2016-05-04	11	-9/+71
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile.lock
\| * \| \|	API support for the 'since' and 'until' operators on commit requests	Paco Guzman	2016-04-29	11	-9/+71
\| \|/ / \| \| \| \| \| \|	- Parameter validation as ISO8601 format
* \| \|	Merge branch 'feature-proposal-contribution-guidelines' into 'master'	Douwe Maan	2016-05-04	1	-0/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature proposal issue template in contributing guide This adds a feature proposal template to the contribution guidelines for internal and external use. Fixes #15448 cc @markpundsack @stanhu @dzaporozhets See merge request !3967
\| * \| \|	feature proposal issue template in contributing guidefeature-proposal-contribution-guidelines	Job van der Voort	2016-04-28	1	-0/+10
\| \| \| \|
* \| \| \|	Merge branch 'lstrip-cop' into 'master'	Rémy Coutable	2016-05-04	1	-2/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable LstripRstrip cop This requires no code changes since it doesn't actually change anything in the codebase, just preventative. See merge request !3959
\| * \| \| \|	Enable LstripRstrip cop	Connor Shea	2016-04-27	1	-2/+1
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This requires no code changes since it doesn't actually change anything in the codebase, just preventative.
* \| \| \|	Merge branch 'add-instrumentation-for-15137' into 'master'	Yorick Peterse	2016-05-04	2	-15/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument methods used in email diffs See merge request !4038
\| * \| \| \|	Instrument methods used in email diffs	Sean McGivern	2016-05-04	2	-15/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make all of the nested constant instrumentation for core app code work the same way, add mailer instrumentation, and add instrumentation to the premailer gem.
* \| \| \| \|	Merge branch 'remove-unnecessary-method-call-in-events-view' into 'master'	Rémy Coutable	2016-05-04	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary method call in events view Since `User#to_param` already returns `User#username`, we don't need to pass in the user's username. Changing this also helps us obey LoD. See merge request !3996
\| * \| \| \| \|	Remove unnecessary method call in events view	Karlo Soriano	2016-05-01	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since `User#to_param` already returns `User#username`, we don't need to pass in the user's username. Changing this also helps us obey LoD.
* \| \| \| \|	Merge branch 'create-wikis-during-check' into 'master'	Douwe Maan	2016-05-04	2	-16/+51
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Initialize wikis on legacy projects during check Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4173 Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423 See merge request !3931
\| * \| \| \| \|	Initialize wikis on legacy projects during check	Jacob Vosmaer	2016-04-26	2	-16/+51
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'revert-devise-async' into 'master'	Rémy Coutable	2016-05-04	5	-2/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Remove the Devise Async gem." This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again. Resolves #17250. See merge request !4027
\| * \| \| \| \| \|	Revert "Remove the Devise Async gem."	Connor Shea	2016-05-03	5	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
* \| \| \| \| \| \|	Merge branch 'rs-unique-signup-fields' into 'master'	Douwe Maan	2016-05-04	4	-22/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve uniqueness of field names on the signup form Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075 See merge request !3826
\| * \| \| \| \| \| \|	Improve uniqueness of field names on the signup formrs-unique-signup-fields	Robert Speicher	2016-04-19	4	-22/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075
* \| \| \| \| \| \| \|	Merge branch 'fix-performance-links' into 'master'	Yorick Peterse	2016-05-04	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed username links in the performance guide See merge request !4036
\| * \| \| \| \| \| \|	Fixed username links in the performance guide	Yorick Peterse	2016-05-04	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These would end up being rendered as: <a href="...">@yorickpeterse</a> <a href="...">@yorickpeterse</a> [ci skip]
* \| \| \| \| \| \| \|	Merge branch 'fix-master-spec' into 'master'	Rémy Coutable	2016-05-04	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a spec that was failing due to !3483 Spec were skipped in this MR so that tests started to fail in master instead of in this MR! /cc @connorshea @rspeicher See merge request !4033
\| * \| \| \| \| \| \|	Fix a spec that was failing due to !3483	Rémy Coutable	2016-05-04	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spec were skipped in this MR so that tests started to fail in master instead of in this MR! Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Achilleas Pipinellis	2016-05-04	1	-5/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Made it clearer that issue_id means iid, not id. See merge request !4030
\| * \| \| \| \| \| \|	Made it clearer that issue_id means iid, not id.	Aral Balkan	2016-05-04	1	-5/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'signout-rel-url' into 'master'	Robert Speicher	2016-05-04	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use sign out path only if not empty Fixes: https://github.com/gitlabhq/gitlabhq/issues/10066 See merge request !3989
\| * \| \| \| \| \| \|	Use sign out path only if not empty	Artem Sidorenko	2016-05-03	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'upgrade-rspec-rails' into 'master'	Robert Speicher	2016-05-03	3	-25/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rspec-rails from 3.3.3 to 3.4.2. This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54 It'll also make it slightly easier to upgrade to 3.5.0 later. Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11 See merge request !3999
\| * \| \| \| \| \| \| \|	Update rspec-rails from 3.3.3 to 3.4.2.	Connor Shea	2016-05-01	3	-25/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54 It'll also make it slightly easier to upgrade to 3.5.0 later. Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11
* \| \| \| \| \| \| \| \|	Merge branch 'link-to-code-review-guide' into 'master'	Robert Speicher	2016-05-03	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to GitLab code review guide in contributing guidelines I noticed that the contributing guidelines still link to the thoughtbot code review guidelines even though we already have our own. [ci skip] See merge request !4018
\| * \| \| \| \| \| \| \| \|	Link to gitlab code review guide in contributing guidelines	Karlo Soriano	2016-05-03	1	-2/+1
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I noticed that the contributing guidelines still link to the thoughtbot code review guidelines even though we already have our own. [ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'improve-2fa-note' into 'master'	Robert Speicher	2016-05-03	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the Two-factor Authentication sign-in text [ci skip] Resolves #14543. See merge request !3483
\| * \| \| \| \| \| \| \| \|	Improve the Two-factor Authentication sign-in text [ci skip]	connorshea	2016-05-03	2	-2/+3
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves #14543.
* \| \| \| \| \| \| \| \|	Merge branch 'doc-installation-pg_trgm' into 'master'	Achilleas Pipinellis	2016-05-03	1	-7/+49
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add clear instructions on installing the pg_trgm extension Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17191 See merge request !4025
\| * \| \| \| \| \| \| \|	Add clear instructions on installing the pg_trgm extension	Achilleas Pipinellis	2016-05-03	1	-7/+49
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'performance-guide' into 'master'	Achilleas Pipinellis	2016-05-03	2	-0/+259
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added performance guidelines Fixes #15254 #14277 See merge request !3303
\| * \| \| \| \| \| \| \|	Copyedit performance document	Achilleas Pipinellis	2016-05-03	1	-22/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Added performance guidelinesperformance-guide	Yorick Peterse	2016-04-30	2	-0/+259
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitlab-org/gitlab-ce#15254 gitlab-org/gitlab-ce#14277 [ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'update-changelog' into 'master'	Yorick Peterse	2016-05-03	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated CHANGELOG for 8.7.2 See merge request !4021
\| * \| \| \| \| \| \| \| \|	Updated CHANGELOG for 8.7.2	Yorick Peterse	2016-05-03	1	-1/+2
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Update link to release docs in README	Robert Speicher	2016-05-03	1	-1/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Update CHANGELOG for 8.6.8, 8.5.12, et al.	Robert Speicher	2016-05-02	1	-1/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-05-02	45	-316/+906
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'rs-notes-privilege-escalation' into 'master'	Robert Speicher	2016-04-26	2	-10/+42
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent privilege escalation via notes API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577 See merge request !1964
\| \| * \| \| \| \| \| \| \|	Prevent privilege escalation via notes API	Robert Speicher	2016-04-26	2	-10/+42
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577
\| * \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Marin Jankovski	2016-04-26	43	-306/+864
\| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch '15579-filter-milestone-confidential-issues-api' into 'master'	Robert Speicher	2016-04-26	2	-2/+39
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent information disclosure via milestone API Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579 See merge request !1961
\| \| \| * \| \| \| \| \| \| \|	Improve Milestones API specs	Rémy Coutable	2016-04-25	2	-38/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| \| * \| \| \| \| \| \| \|	Filter confidential issues from milestones API if user does not have access	Stan Hu	2016-04-25	3	-2/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579