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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Change project FK migration to skip existing FKsproject-foreign-keys-without-errors	Yorick Peterse	2017-08-02	2	-8/+30
\| \| \| \| \| \|	This changes the migration ProjectForeignKeysWithCascadingDeletes so that it does not add already existing foreign keys and indexes, making it easier to re-run the migration.
*	Merge branch 'api_project_events_target_iid' into 'master'	Rémy Coutable	2017-08-02	3	-1/+7
\|\ \| \| \| \| \| \| \| \|	Expose target_iid in Events API See merge request !13247
\| *	Expose target_iid in Events API	sue445	2017-08-02	3	-1/+7
\| \|
* \|	Merge branch 'ericy_ts/protected_branches_api' into 'master'	Rémy Coutable	2017-08-02	11	-8/+504
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Extending API for protected branches See merge request !12756
\| * \|	Extending API for protected branches	Eric	2017-08-02	11	-8/+504
\|/ /
* \|	Merge branch 'rugged-is-ancestor' into 'master'	Sean McGivern	2017-08-02	2	-1/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add rugged_is_ancestor method See merge request !13232
\| * \|	Add rugged_is_ancestor method	Jacob Vosmaer	2017-08-01	2	-1/+8
\| \| \|
* \| \|	Merge branch '35769-fix-ruby-2-4-compatibility' into 'master'	Sean McGivern	2017-08-02	2	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Issue board when using Ruby 2.4 Closes #35769 See merge request !13220
\| * \| \|	Fix Issue board when using Ruby 2.435769-fix-ruby-2-4-compatibility	Rémy Coutable	2017-08-01	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In Ruby 2.4, Hash#compact exists and returns a Hash, while in Ruby 2.3, Hash#compact is implemented by Rails and returns a new `ActionController::Parameters` instance in this case. Also, `ActionController::Parameters#compact` is deprecated in Rails 5.1 so we're using `reject { \|_, value\| value.nil? }` instead. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'rs-issuables-list-metadata-shared-examples' into 'master'	Rémy Coutable	2017-08-02	2	-9/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the 'issuables list meta-data' shared example less dangerous See merge request !13236
\| * \| \| \|	Make the 'issuables list meta-data' shared example less dangerousrs-issuables-list-metadata-shared-examples	Robert Speicher	2017-08-01	2	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This shared example would take an object's database ID and create a number of objects based on it. If for some reason the ID were a high number, like 20, this would create `20 + 21 + 22` objects. Not only was this dangerous from a performance perspective, it was entirely unnecessary, as the behavior it was testing is already well-tested in the unit test for the underlying object. For a controller test, which is what's including this shared example, all we need to do is verify that the assigned object contains the correct `id => object` Hash, which is what we now test for.
* \| \| \| \|	Merge branch 'rs-empty_project-cleanup' into 'master'	Rémy Coutable	2017-08-02	115	-200/+214
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure all project factories use `:repository` trait or `:empty_project` See merge request !13238
\| * \| \| \| \|	Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanup	Robert Speicher	2017-08-01	115	-200/+214
\| \|/ / / /
* \| \| \| \|	Merge branch 'add-filtered-search-group-issues-ce' into 'master'	Phil Hughes	2017-08-02	19	-45/+400
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add filtered search to group issue dashboard Closes #33575 See merge request !13167
\| * \| \| \| \|	Add filtered search to group issue dashboard	Clement Ho	2017-08-02	19	-45/+400
\|/ / / / /
* \| \| \| \|	Merge branch 'use-npm-cropper' into 'master'	Phil Hughes	2017-08-02	4	-2995/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove jQuery cropper plugin from vendors directory See merge request !13239
\| * \| \| \| \|	include cropper jQuery plugin as an npm moduleuse-npm-cropper	Mike Greiling	2017-08-01	4	-2995/+9
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'pawel/add_more_variables_to_additional_metrics-35267' into ↵	Douwe Maan	2017-08-02	7	-36/+89
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add kube_namespace and standardize common variables for additional metrics queries See merge request !13169
\| * \| \| \| \|	Remove default arguments for common query contextpawel/add_more_variables_to_additional_metrics-35267	Pawel Chojnacki	2017-08-01	2	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Move timeframe_start and timeframe_end to common query context	Pawel Chojnacki	2017-08-01	3	-14/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Give metric query context rspec examples correctly sounding names. + missing ↵	Pawel Chojnacki	2017-08-01	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	whitespace
\| * \| \| \| \|	Add changelog: add support for kube_namespace in Metrics queries	Pawel Chojnacki	2017-07-31	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ small whitespace fix to better separate tests
\| * \| \| \| \|	Tests for query context variables	Pawel Chojnacki	2017-07-31	3	-18/+34
\| \| \| \| \| \|
\| * \| \| \| \|	Context handling and tests cleanup + simple test kube_namespace context test	Pawel Chojnacki	2017-07-31	5	-26/+49
\| \| \| \| \| \|
\| * \| \| \| \|	add kube_namespace and standardize common variables for additional metrics ↵	Pawel Chojnacki	2017-07-31	3	-12/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	queries
* \| \| \| \| \|	Merge branch '35815-webhook-log-encoding-error' into 'master'	Dmitriy Zaporozhets	2017-08-02	3	-1/+28
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix encoding error for WebHook logging Closes #35815 See merge request !13230
\| * \| \| \| \| \|	Fix encoding error for WebHook logging	Alexander Randa	2017-08-01	3	-1/+28
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'winh-markdown-autocomplete-dropdown-style' into 'master'	Annabel Dunstone Gray	2017-08-01	1	-0/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Markdown autocomplete dropdowns style consistent See merge request !13127
\| * \| \| \| \| \| \|	Make Markdown autocomplete dropdown style consistentwinh-markdown-autocomplete-dropdown-style	winh	2017-08-01	1	-0/+25
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'winh-derive-project-name' into 'master'	Clement Ho	2017-08-01	3	-11/+184
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Derive project path from import URL Closes #27341 See merge request !13131
\| * \| \| \| \| \| \|	Derive project path from import URL	Winnie Hellmann	2017-08-01	3	-11/+184
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs-update-articles-list' into 'master'	Achilleas Pipinellis	2017-08-01	2	-6/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: update articles list Closes #35800 See merge request !13229
\| * \| \| \| \| \| \|	add article to listdocs-update-articles-list	Marcia Ramos	2017-08-01	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also, trigger build
\| * \| \| \| \| \| \|	link to CI/CD Deep Dive demo for #5800	Marcia Ramos	2017-08-01	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	copyedit, add article to the list	Marcia Ramos	2017-08-01	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'search-flickering' into 'master'	Filipa Lacerda	2017-08-01	2	-3/+7
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the search losing focus Closes #35515 See merge request !13221
\| * \| \| \| \| \| \|	Fixes the search losing focussearch-flickering	Phil Hughes	2017-08-01	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was caused by the blur & then the focus after transition end Closes #35515
* \| \| \| \| \| \| \|	Merge branch '33620-remove-events-from-notification_settings' into 'master'	Douwe Maan	2017-08-01	8	-42/+29
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove `events` from `notification_settings`" Closes #33620 See merge request !13152
\| * \| \| \| \| \| \|	Remove events column from notification settings33620-remove-events-from-notification_settings	Sean McGivern	2017-07-31	8	-42/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was migrated to separate columns in 9.4, and now just needs to be removed for real.
* \| \| \| \| \| \| \|	Merge branch '34869-bump-rubocop-to-0-49-1-and-rubocop-rspec-to-1-15-1' into ↵	Robert Speicher	2017-08-01	5	-314/+383
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1 Closes #34869 See merge request !12741
\| * \| \| \| \| \| \|	Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1	Takuya Noguchi	2017-08-01	5	-314/+383
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'doc_code_review' into 'master'	Rémy Coutable	2017-08-01	1	-0/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add code review guidelines related to Build [CI skip]. See merge request !13223
\| * \| \| \| \| \| \| \|	Add code review guidelines related to Build [CI skip].	Marin Jankovski	2017-08-01	1	-0/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix/sm/35825-api-specs-and-linting-failing-on-master' into ↵	Rémy Coutable	2017-08-01	2	-4/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix "API specs and linting failing on master" Closes #35825 See merge request !13227
\| * \| \| \| \| \| \| \|	Add 204. Remove duplicated method.fix/sm/35825-api-specs-and-linting-failing-on-master	Shinya Maeda	2017-08-01	2	-4/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-cycle-analytics-dropdown-style' into 'master'	Annabel Dunstone Gray	2017-08-01	1	-0/+22
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make time span dropdown style on cycle analytics page consistent See merge request !13183
\| * \| \| \| \| \| \| \|	Make time span dropdown style on cycle analytics page consistent	Winnie Hellmann	2017-08-01	1	-0/+22
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'rc/fetch-before-finding-merge-base-in-ee_compat_check' into ↵	Sean McGivern	2017-08-01	1	-2/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Always fetch branches before finding the merge base, otherwise we could find an outdated merge base See merge request !13226
\| * \| \| \| \| \| \| \|	Always fetch branches before finding the merge base, otherwise we could find ↵rc/fetch-before-finding-merge-base-in-ee_compat_check	Rémy Coutable	2017-08-01	1	-2/+0
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	an outdated merge base Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'blob-limit-test' into 'master'	Sean McGivern	2017-08-01	1	-2/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug in blob test See merge request !13224