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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Add changelog for duplicate branch bug in mr version featuredz-improve-mr-versions	Dmitriy Zaporozhets	2016-09-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Fix duplicate master entries in the mr versions dropdown	Dmitriy Zaporozhets	2016-09-28	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch '22202-reduce-duplication-in-gitlab-diff-position_tracer' into ↵	Douwe Maan	2016-09-28	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Reduce duplication in `Gitlab::Diff::PositionTracer` ## What does this MR do? This factorize similar code from `Gitlab::Diff::PositionTracer` ## Are there points in the code the reviewer needs to double check? The code might be harder to understand now... ## Why was this MR needed? To get rid of flay offense. ## Does this MR meet the acceptance criteria? - Tests - [x] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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) ## What are the relevant issue numbers? Closes #22202 See merge request !6365
\| * \| \| \| \| \| \| \|	Tell Flay to ignore Gitlab::Diff::PositionTracer22202-reduce-duplication-in-gitlab-diff-position_tracer	Rémy Coutable	2016-09-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch '22679-avoid-abstract-reference-filter-project-requests' into ↵	Yorick Peterse	2016-09-28	3	-5/+22
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' AbstractReferenceFilter caches current project_ref on RequestStore when active See merge request !6545
\| * \| \| \| \| \| \| \| \|	AbstractReferenceFilter caches current project_ref on RequestStore when active22679-avoid-abstract-reference-filter-project-requests	Paco Guzman	2016-09-28	3	-5/+22
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before we weren’t caching current_project_ref because normally the reference to the current project doesn’t include the path with namespace. But now we store the current project in the projects reference cache to be used for the same filter when accessing using path with namespace of for subsequent filters executed on the cache.
* \| \| \| \| \| \| \| \|	Merge branch 'add-university-content' into 'master'	Achilleas Pipinellis	2016-09-28	23	-0/+1648
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add university content ## What does this MR do? Imports gitlab-org/University content into doc/university to deprecate university.gitlab.com and access it from doc.gitlab.com/universtiy. ## Are there points in the code the reviewer needs to double check? That there are no broken links. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added ## What are the relevant issue numbers? #22449 See merge request !6520
\| * \| \| \| \| \| \| \|	Resolve merge request commentsadd-university-content	Sean Packham	2016-09-28	1	-5/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix links	Sean Packham	2016-09-27	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Resolve merge request comments	Sean Packham	2016-09-27	4	-35/+27
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into add-university-content	Sean Packham	2016-09-27	12	-27/+212
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Readded images	Sean Packham	2016-09-27	15	-0/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Removed lfs	Sean Packham	2016-09-27	16	-46/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix lint error	Sean Packham	2016-09-27	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Migrate university to use lfs for images	Sean Packham	2016-09-27	16	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into add-university-content	Sean Packham	2016-09-27	78	-223/+575
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Added University content	Sean Packham	2016-09-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into add-university-content	Sean Packham	2016-09-26	32	-156/+384
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Imported GitLab University content	seanpackham	2016-09-23	23	-0/+1655
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '22681-avoid-empty-queries-on-reference-parsers' into 'master'	Yorick Peterse	2016-09-28	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"Banzai::ReferenceParser::BaseParser is executing queries that don't return results" See merge request !6546
\| * \| \| \| \| \| \| \| \| \| \|	Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes ↵22681-avoid-empty-queries-on-reference-parsers	Paco Guzman	2016-09-28	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	without references
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bbodenmiller/gitlab-ce-patch-2' into 'master'	Rémy Coutable	2016-09-28	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add footnote to Markdown docs _Originally opened at !3741 by @bbodenmiller._ - - - See merge request !6564
\| * \| \| \| \| \| \| \| \| \| \| \|	Add footnote to Markdown docs	Ben Bodenmiller	2016-09-28	1	-0/+10
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-bundle-quiet-mode' into 'master'	Robert Speicher	2016-09-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce output to the build log Remove a log of useless info from the build log by adding `--quiet` flag. [Bundler docs](https://bundler.io/v1.2/bundle_install.html) See merge request !6560
\| * \| \| \| \| \| \| \| \| \| \|	Reduce output to the build logzj-bundle-quiet-mode	Z.J. van de Weg	2016-09-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'hvlad/gitlab-ce-feature/add_test_for_git_http_ldap_user' into ↵	Rémy Coutable	2016-09-28	2	-324/+381
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Added git http requests tests for user with LDAP identity ## What does this MR do? Added tests to git http request for a user with ldap identity. ## Are there points in the code the reviewer needs to double check? In order to stick to the way the existing tests are defined in spec files, I have added the new tests in the same spec file that coveres the git http request feature and thus it seems to be a lot of changes in the git_http_spec.rb when looking at the commit git in Gitlab, but the largest change is indentation so please check with a better diff tool (i.e. kdiff3). Let me know if this is OK with you or do you want to have a new file introduced (i.e. `git_http_ldap_spec.rb`) ## Why was this MR needed? To increase test coverage and to make sure the changes that will be introduced by #20820 will not introduce any regressions. ## What are the relevant issue numbers? #20820 See merge request !6559
\| * \| \| \| \| \| \| \| \| \| \|	Added git http requests tests for user with LDAP identity	Horatiu Eugen Vlad	2016-09-28	2	-324/+381
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'siemens/gitlab-ce-fix/ldap-access-errors' into 'master'	Rémy Coutable	2016-09-28	5	-5/+44
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log LDAP lookup errors and don't swallow unrelated exceptions - Previously all exceptions were ignored, now only `Net::LDAP::Error` and exceptions that inherit from it are caught by the `rescue` clause. There might be other exceptions that should also be ignored / dealt with. - Not sure if the Rails production log is a good choice for this, or if the GitLab application log would be more appropriate. See merge request !6558
\| * \| \| \| \| \| \| \| \| \|	Log LDAP lookup errors and don't swallow unrelated exceptions	Markus Koller	2016-09-28	5	-5/+44
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Roger Meier <r.meier@siemens.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'glensc/gitlab-ce-ruby-prof-0.16' into 'master'	Rémy Coutable	2016-09-28	3	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump ruby prof to 0.16 See merge request !6557
\| * \| \| \| \| \| \| \| \|	Bump ruby prof to 0.16	Elan Ruusamäe	2016-09-28	3	-3/+4
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This solve issues with ruby builds with rubygems preload see https://github.com/ruby-prof/ruby-prof/pull/191 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'is-v-cloak-causing-master-to-fail-pls-no-why' into 'master'	Jacob Schatz	2016-09-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed to v-cloak attr to hash rocket and string 'true' ## What does this MR do? Changed to v-cloak attr to hash rocket and string 'true' ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Maybe it's killing `master`? :confused: ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6553
\| * \| \| \| \| \| \| \|	Remove test for Ruby 2.1.	Jacob Schatz	2016-09-27	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Run Ruby 2.1 tests on non-master branches too.is-v-cloak-causing-master-to-fail-pls-no-why	Connor Shea	2016-09-27	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Changed to hash rocket and string 'true'	Luke Bennett	2016-09-27	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'label-update-check-new' into 'master'	Jacob Schatz	2016-09-27	4	-8/+35
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send ajax request for label update only if they are changed ## What does this MR do? At the moment we send requests to update the labels on issue even if nothing has been changed. This fixes that and only sends requests when something has actually been changed. The code gets the initial selected values based on the inputs & then compares that to the selected values when submitting. If they are equal, then no request is sent. ## What are the relevant issue numbers? Closes #19472 See merge request !5071
\| * \| \| \| \| \| \| \|	Send ajax request for label update only if they are changed (#19472 !5071)label-update-check-new	Phil Hughes	2016-09-27	4	-8/+35
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/optimize-github-importer-for-speed-and-memory' into 'master'	Yorick Peterse	2016-09-27	5	-78/+87
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize GitHub importer for speed and memory See merge request !6552
\| * \| \| \| \| \| \| \| \|	Call after_remove_branch only once after importing all GitHub PRsfix/optimize-github-importer-for-speed-and-memory	Ahmad Sherif	2016-09-27	2	-2/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Import all GitHub comments after importing issues and PRs	Ahmad Sherif	2016-09-27	2	-12/+17
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Speed up label-applying process for GitHub importing	Ahmad Sherif	2016-09-27	2	-14/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* No need to re-fetch issues from GH to read their labels, the labels are already there from the index request. * No need to look up labels on the database for every application, so we cache them.
\| * \| \| \| \| \| \| \| \|	Process each page of GitHub resources instead of concating them then processing	Ahmad Sherif	2016-09-27	3	-56/+58
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should avoid having large memory growth when importing GitHub repos with lots of resources.
* \| \| \| \| \| \| \| \|	Merge branch '22472-wrong-table-head' into 'master'	Fatih Acet	2016-09-27	1	-7/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pipelines table headers ## What does this MR do? Removed stages loop for a single 'Stages' header. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The headers were messing the table up. Note the redundant headers and squished cells. ![Screen_Shot_2016-09-27_at_14.40.51](/uploads/331b08c30a4af59cefc460ab4f3c2a61/Screen_Shot_2016-09-27_at_14.40.51.png) ## Screenshots (if relevant) ![Screen_Shot_2016-09-27_at_14.39.04](/uploads/687895e9152d4fe8d8f3bfc1233af39b/Screen_Shot_2016-09-27_at_14.39.04.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22472 See merge request !6542
\| * \| \| \| \| \| \| \| \|	Removed stages loop for a single 'Stages' header22472-wrong-table-head	Luke Bennett	2016-09-27	1	-7/+1
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'includes-projects-to-render-issue-notes' into 'master'	Yorick Peterse	2016-09-27	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix IssuesController#show degradation including project on loaded notes See merge request !6540
\| * \| \| \| \| \| \| \|	Fix IssuesController#show degradation including project on loaded notesincludes-projects-to-render-issue-notes	Paco Guzman	2016-09-27	2	-1/+2
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'add-calendar-tests' into 'master'	Jacob Schatz	2016-09-27	2	-9/+101
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more tests for calendar contribution ## What does this MR do? Add more tests for calendar contribution ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improve test coverage for calendar ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22347 See merge request !6421
\| * \| \| \| \| \| \| \|	Add more tests for calendar contribution	Clement Ho	2016-09-26	2	-9/+101
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '22053-bump-gitlab-shell-to-have-git-trace' into 'master'	Rémy Coutable	2016-09-27	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-shell v3.6.2 ## What does this MR do? Bump gitlab-shell to v3.6.2 to be able to enable GIT_TRACE_PERFORMANCE output to a log file Relates #22053 See merge request !6367
\| * \| \| \| \| \| \| \| \|	Use gitlab-shell v3.6.2 (GIT TRACE logging)22053-bump-gitlab-shell-to-have-git-trace	Paco Guzman	2016-09-26	2	-1/+2
\| \| \| \| \| \| \| \| \| \|