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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'improve-issues-filter-all-spec' into 'master'	Dmitriy Zaporozhets	2016-03-14	2	-9/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use Capybara find methods and remove sleeps in feature specs in "All Issues" filter Fixes sporadic build failures (e.g. https://gitlab.com/gitlab-org/gitlab-ce/builds/856233) See merge request !3198
\| *	Use Capybara find methods and remove sleeps in feature specs in "All Issues" ↵improve-issues-filter-all-spec	Stan Hu	2016-03-13	2	-9/+6
\| \| \| \| \| \| \| \|	filter
* \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Marin Jankovski	2016-03-14	5	-23/+20
\|\ \
\| * \	Merge branch 'redirect-host-check' into 'master'	Douwe Maan	2016-03-13	5	-23/+20
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redirect host check Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2649 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13956 See merge request !1945
\| \| * \|	Fix denting and spec	Zeger-Jan van de Weg	2016-03-13	3	-4/+4
\| \| \| \|
\| \| * \|	ContinueToParams -> ContinueParams	Zeger-Jan van de Weg	2016-03-13	4	-4/+5
\| \| \| \|
\| \| * \|	Check redirect path in the continue_params	Zeger-Jan van de Weg	2016-03-13	3	-21/+17
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2649 https://gitlab.com/gitlab-org/gitlab-ce/issues/13956
* \| \|	Merge branch 'upcoming' into 'master'	Douwe Maan	2016-03-13	4	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implements upcoming filter in milstones ![Imgur](http://i.imgur.com/Oc2LZrF.png) @DouweM @JobV I think this is what you wanted :) Lemme know if it there is something that need changing Had alot of fun doing it! Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14102 See merge request !3148
\| * \| \|	fixes small issues	tiagonbotelho	2016-03-13	2	-3/+2
\| \| \| \|
\| * \| \|	removes tab and replaces with space in changelog	tiagonbotelho	2016-03-12	1	-0/+1
\| \| \| \|
\| * \| \|	adds my name to changelog	tiagonbotelho	2016-03-12	1	-0/+1
\| \| \| \|
\| * \| \|	fixes issues	tiagonbotelho	2016-03-12	2	-5/+4
\| \| \| \|
\| * \| \|	fixes issues for mr acceptance	tiagonbotelho	2016-03-12	2	-8/+12
\| \| \| \|
\| * \| \|	implements upcoming filter in milstones	tiagonbotelho	2016-03-12	3	-0/+10
\| \| \| \|
* \| \| \|	Merge branch 'reduce-example-duplication' into 'master'	Sytse Sijbrandij	2016-03-13	3	-37/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce example documentation. We should not duplicate indexes between the top level and lower level. See merge request !3162
\| * \| \| \|	Remove duplicate entries.	Sytse Sijbrandij	2016-03-12	1	-6/+2
\| \| \| \| \|
\| * \| \| \|	Reduce example documentation.reduce-example-duplication	Sytse Sijbrandij	2016-03-10	3	-37/+17
\| \| \| \| \|
* \| \| \| \|	Merge branch 'revert-5a586f36' into 'master'	Douwe Maan	2016-03-12	6	-16/+82
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Revert "Merge branch 'support-go-subpackages' into 'master'"" This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5 See merge request !3194
\| * \| \| \|	Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""	Stan Hu	2016-03-12	6	-16/+82
\|/ / / / \| \| \| \| \| \| \| \|	This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5
* \| \| \|	Merge branch 'remove-goget-spec' into 'master'	Douwe Maan	2016-03-12	1	-13/+0
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary go-get test (superseded by middleware) See merge request !3193
\| * \| \|	Remove unnecessary go-get test (superseded by middleware)	Stan Hu	2016-03-12	1	-13/+0
\|/ / /
* \| \|	Revert "Merge branch 'support-go-subpackages' into 'master' "	Douwe Maan	2016-03-12	6	-82/+16
\| \| \| \| \| \| \| \| \|	This reverts merge request !3191
* \| \|	Merge branch 'support-go-subpackages' into 'master'	Douwe Maan	2016-03-12	6	-16/+82
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support Golang subpackage fetching Closes #13805 See merge request !3191
\| * \|	Ensure PATH_INFO exists for go-get	Stan Hu	2016-03-12	1	-1/+1
\| \| \|
\| * \|	Add spec for go-import middleware	Stan Hu	2016-03-12	1	-0/+30
\| \| \|
\| * \|	Simplify code	Stan Hu	2016-03-12	1	-4/+3
\| \| \|
\| * \|	Remove existing go_import.html.haml implementation	Stan Hu	2016-03-12	2	-16/+0
\| \| \|
\| * \|	Support Golang subpackage fetchingsupport-go-subpackages	Stan Hu	2016-03-12	3	-0/+53
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #13805
* \| \|	Merge branch 'projects-finder-ee-compatible' into 'master'	Dmitriy Zaporozhets	2016-03-12	2	-7/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed User#project_relations This is to make things more compatible with EE so merging is easier. cc @dzaporozhets See merge request !3192
\| * \| \|	Removed User#project_relationsprojects-finder-ee-compatible	Yorick Peterse	2016-03-12	2	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab EE adds an extra relation that selects a "project_id" column instead of an "id" column, making it very hard for this method to be re-used in EE. Since using User#authorized_groups in ProjectsFinder#all_groups apparently has no performance impact we can just use it and keep everything compatible with EE.
* \| \| \|	Merge branch 'filter-import-url' into 'master'	Douwe Maan	2016-03-12	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter import_url params because they may contain auth information. Fixes #14199 cc @dzaporozhets @DouweM tagging you since this is security related. See merge request !3174
\| * \| \| \|	Filter import_url params because they may contain auth information. Fixes #14199filter-import-url	Josh Frye	2016-03-10	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'fix-gh-pr-import' into 'master'	Douwe Maan	2016-03-12	3	-45/+40
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix importing PR's from GitHub when the source repo was removed Closes #13847 Closes gitlab-com/support-forum#584 See merge request !3172
\| * \| \| \|	Fix importing PR's from GitHub when the source repo was removed	Douglas Barbosa Alexandre	2016-03-10	3	-45/+40
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-disallow-blank-line-code' into 'master'	Douwe Maan	2016-03-12	3	-1/+23
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow blank (non-null) values for a Note's `line_code` attribute It's unclear how these blank values got added, but GitLab.com had a few: ``` irb(main):002:0> Note.where("line_code IS NOT NULL AND line_code = ''").count => 439 ``` We've added a migration to convert any existing records to use a NULL value when blank, and updated Note to set blank values to nil before validation. See merge request !3118
\| * \| \| \| \|	Disallow blank (non-null) values for a Note's `line_code` attributers-disallow-blank-line-code	Robert Speicher	2016-03-11	3	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's unclear how these blank values got added, but GitLab.com had a few: ``` irb(main):002:0> Note.where("line_code IS NOT NULL AND line_code = ''").count => 439 ``` We've added a migration to convert any existing records to use a NULL value when blank, and updated Note to set blank values to nil before validation.
* \| \| \| \| \|	Merge branch 'ignore-byebug-history' into 'master'	Douwe Maan	2016-03-12	1	-0/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore .byebug_history This allows me to use `git add .` without problems and retain all my history of `byebug` What do you think @DouweM? See merge request !3145
\| * \| \| \| \|	Ignore .byebug_historyignore-byebug-history	Zeger-Jan van de Weg	2016-03-09	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/token-timing-attack' into 'master'	Douwe Maan	2016-03-12	2	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix token issue - timing attack Updates token comparisons to use a secure version instead of `==` Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13617 See merge request !3062
\| * \| \| \| \| \|	add SHA256 to secure_comparefix/token-timing-attack	James Lopez	2016-03-08	2	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-03-08	356	-3055/+4414
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/token-timing-attack
\| * \| \| \| \| \| \|	fix token issue - timing attack	James Lopez	2016-03-02	2	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2016-03-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-lookup' # Conflicts: # app/helpers/application_helper.rb
\| * \| \| \| \| \| \| \|	ensure also alternative email addresses are used when looking up user	nico de ceulaer	2016-03-03	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix_responsive_layout_bug' into 'master'	Jacob Schatz	2016-03-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix responsive bug top navigation Hi, I have found and fixed a minor layout bug (responsive) This is the situation before the fix: ![before](/uploads/55bf61a64fb49a763c5f8381bf46d390/before.png) And this is the situation after the fix: ![after](/uploads/33ba091156d404e52c41f134121c59f0/after.png) See merge request !3190
\| * \| \| \| \| \| \| \| \|	Fix responsive bug top navigation	Dennis van de Hoef	2016-03-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-12944' into 'master'	Douwe Maan	2016-03-11	3	-18/+52
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a custom Devise failure app to handle unauthenticated .zip requests Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944 See merge request !2828
\| * \| \| \| \| \| \| \| \|	Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944	Robert Speicher	2016-03-08	3	-18/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
* \| \| \| \| \| \| \| \| \|	Merge branch 'trigram-index-searching' into 'master'	Robert Speicher	2016-03-11	36	-71/+926
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor searching and use PostgreSQL trigram indexes for significantly improved performance Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13743. Also fixes #12410 See merge request !2987
\| * \| \| \| \| \| \| \| \| \|	More detailed trigram migration error messagetrigram-index-searching	Yorick Peterse	2016-03-11	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This explains the user what they need to run and where to go in case they want to learn more about "CREATE EXTENSION".