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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into rename-ci-commit	Kamil Trzcinski	2016-06-06	52	-180/+2027
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/features/builds_spec.rb
\| * \| \ \ \ \ \ \ \ \	Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2	Kamil Trzcinski	2016-06-06	124	-949/+1958
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| / / \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # features/steps/shared/builds.rb # spec/requests/ci/api/builds_spec.rb
\| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into rename-ci-commit	Kamil Trzcinski	2016-06-06	116	-907/+1916
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Fix tests offenses: use `pipeline` of Ci::Build and rename views	Kamil Trzcinski	2016-06-06	11	-44/+44
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Rename remaining ci_commits in specs	Kamil Trzcinski	2016-06-03	4	-5/+5
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2	Kamil Trzcinski	2016-06-03	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* rename-ci-commit: Fix merge_request handling
\| \| * \| \| \| \| \| \| \|	Fix merge_request handling	Kamil Trzcinski	2016-06-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename `commit` to `pipeline` in application code	Kamil Trzcinski	2016-06-03	2	-16/+16
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features	Kamil Trzcinski	2016-06-03	39	-375/+373
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commit	Kamil Trzcinski	2016-06-03	21	-22/+270
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9': Let contributors know where to start Ensure branch cleanup regardless of whether the import process succeeds Fix failing todo tests Reorder the todos because the use of the project finder attempts to order them differently Update target todo test to use a public project Use the project finder in the todos finder to limit todos to just ones within projects you have access to. Move filtering todos by projects not pending deletion into a scope on the todo model Reduce the filters on the todos joins project query by being explicit about the join Ensure we don't show TODOS for projects pending delete Fix deprecation warnings in spec/services/issues/bulk_update_service_spec.rb Remove unused Issuable#is_assigned? method fixup! Don't allow merges with new commits fixup! Add `sha` parameter to MR accept API Reduce Namespace queries in UserReferenceFilter Added ReferenceFilter#nodes Returning enums in ReferenceFilter#each_node Don't allow merges with new commits Add `sha` parameter to MR accept API
\| * \| \| \| \| \| \| \|	Fix other places where we still use commit attribute of Build	Kamil Trzcinski	2016-06-03	5	-27/+27
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix more places where we should rename ci_commit to pipeline	Kamil Trzcinski	2016-06-03	8	-18/+18
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use foreign_key to define column name	Kamil Trzcinski	2016-06-03	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Delegate to pipeline instead of commit	Kamil Trzcinski	2016-06-03	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use pipelines in context of Project	Kamil Trzcinski	2016-06-03	13	-20/+20
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into rename-ci-commit	Kamil Trzcinski	2016-06-03	40	-204/+270
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Try to use `pipeline` where applicable	Kamil Trzcinski	2016-06-03	5	-10/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename Ci::Build commit to pipeline	Kamil Trzcinski	2016-06-03	24	-100/+100
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use ci_commits table	Kamil Trzcinski	2016-06-03	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline	Kamil Trzcinski	2016-06-02	35	-81/+81
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'gh-disable-webhooks'	Douwe Maan	2016-06-07	5	-4/+115
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Update CHANGELOG	Douglas Barbosa Alexandre	2016-06-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add a message warning user that Webhooks will be disabled	Douglas Barbosa Alexandre	2016-06-06	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Disable Webhooks before proceeding with the GitHub import	Douglas Barbosa Alexandre	2016-06-06	3	-4/+110
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'gh-fix-comments-on-diff'	Douwe Maan	2016-06-07	3	-0/+8
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Fix importer for GitHub comments on diffgh-fix-comments-on-diff	Douglas Barbosa Alexandre	2016-06-06	3	-0/+8
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix comments on diff after LegacyDiffNote was extracted from Note
* \| \| \| \| \| \| \| \| \|	Merge branch 'gh-rate-limit'	Douwe Maan	2016-06-07	7	-36/+97
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG	Douglas Barbosa Alexandre	2016-06-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move create! method from formatters to the BaseFormatter	Douglas Barbosa Alexandre	2016-06-06	5	-10/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Import GitHub repositories respecting the API rate limit	Douglas Barbosa Alexandre	2016-06-06	5	-36/+92
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While Octokit auto pagination set the page size to the maximum 100, and seek to not overstep the rate limit. When the rate limit is reached its raises an exception, and stop doing new requests. Here we use a custom pattern for traversing large lists, so we can check if we’ll reach the rate limit and wait the API to reset the rate limit before making new requests.
* \| \| \| \| \| \| \| \|	Merge branch 'license-finder-gem' into 'master'	Rémy Coutable	2016-06-07	7	-0/+289
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	License finder gem Every time a gem is added to the Gemfile, or a gem is updated with a new dependency or change of license, LicenseFinder will check to ensure that the license in use has been whitelisted for use in the project. GPLv2 and GPLv3 libraries are not allowed to be linked-to from non-GPL projects (e.g. the MIT-licensed GitLab CE or proprietary EE), otherwise we're violating the license. https://github.com/pivotal/LicenseFinder See also: gitlab-com/operations#164 See merge request !3775
\| * \| \| \| \| \| \| \| \|	Resolve feedback.	Connor Shea	2016-06-06	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add relevant commands to the licensing document, resolve some feedback.	Connor Shea	2016-06-06	2	-3/+34
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make sure to mention the GNU Project and OSI-provided information regarding ↵	Connor Shea	2016-06-06	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the GPL so no one tries to disagree with that decision.
\| * \| \| \| \| \| \| \| \|	Add Licensing information and guidelines to the Documentation.	Connor Shea	2016-06-06	3	-1/+60
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix up all the decisions in the YML file.	Connor Shea	2016-06-06	1	-115/+96
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add gems and licenses that were previously missing. Approve a number of ↵	Connor Shea	2016-06-06	2	-8/+116
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	licenses after a bunch of research today.
\| * \| \| \| \| \| \| \| \|	Add some gems' licenses not caught by License Finder.	Connor Shea	2016-06-06	3	-0/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also add License Finder to CI (only runs on master).
\| * \| \| \| \| \| \| \| \|	Add License Finder gem.	Connor Shea	2016-06-06	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order to rehost all our gems in our own gem host, we need to have the legal rights to do so for every gem should they be taken down from RubyGems. License Finder automates checking of gems to ensure that we're in the clear legally. Approved the MIT License because it essentially allows us to do "whatever" with those gems. I am not a lawyer. https://github.com/pivotal/LicenseFinder
* \| \| \| \| \| \| \| \| \|	Merge branch 'colorize-db-seed' into 'master'	Rémy Coutable	2016-06-07	2	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missed colorize methods. Fix #18250. cc: @twk3 See merge request !4495
\| * \| \| \| \| \| \| \| \| \|	Fix missed colorize methods.	Connor Shea	2016-06-06	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'bump-rouge' into 'master'	Stan Hu	2016-06-07	3	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump rouge to 1.11.0 See: https://github.com/jneen/rouge/blob/master/CHANGELOG.md See merge request !4491
\| * \| \| \| \| \| \| \| \| \| \|	Bump rouge to 1.11.0	Stan Hu	2016-06-06	3	-3/+4
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch '18254-use-better_errors-editor-links-in-sherlock' into 'master'	Robert Speicher	2016-06-07	2	-3/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use better_errors editor links in sherlock Closes #18254. Uses the same editor configuration of `better_errors` so that you don't have to configure things twice. Remember to have a custom initializer that specifies your editor. Example for atom. File `config/initializers/better_errors.rb`: ````ruby if defined?(BetterErrors) BetterErrors.editor = "atm://open?url=file://%{file}&line=%{line}" end ```` See merge request !4497
\| * \| \| \| \| \| \| \| \| \|	Use better_errors editor links in sherlock18254-use-better_errors-editor-links-in-sherlock	Alejandro Rodríguez	2016-06-06	2	-3/+11
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remember to configure your `better_errors` editor to point to your program of preference
* \| \| \| \| \| \| \| \| \|	Merge branch 'wiki-bottom-padding' into 'master'	Jacob Schatz	2016-06-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add padding to bottom of wiki page, fix #12921. ## What does this MR do? Adds padding to the bottom of the wiki page so it's not right up against the edge of the browser window. ## What are the relevant issue numbers? #12921 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-06_at_12.21.22_PM](/uploads/9710682a57f5e521253f17a65f896f4d/Screen_Shot_2016-06-06_at_12.21.22_PM.png) After: ![Screen_Shot_2016-06-06_at_12.20.50_PM](/uploads/002068b072050e0f8146757a0386d30f/Screen_Shot_2016-06-06_at_12.20.50_PM.png) cc: @jschatz1 See merge request !4490
\| * \| \| \| \| \| \| \| \|	Add padding to bottom of wiki page, fix #12921.	Connor Shea	2016-06-06	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue_3359' into 'master'	Yorick Peterse	2016-06-06	5	-6/+30
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicated notification settings and add unique index See merge request !4472
\| * \| \| \| \| \| \| \| \|	change add_concurrent_index function argumentsissue_3359	Felipe Artur	2016-06-06	2	-10/+13
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add index to notification settings	Felipe Artur	2016-06-03	4	-1/+22
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|