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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Document a new migrations testing techniquedocs/gb/document-new-migrations-testing-technique	Grzegorz Bizon	2017-06-15	1	-0/+87
\|
*	Merge branch 'instrument-merge-request-diff-load-commits' into 'master'	Sean McGivern	2017-06-15	3	-0/+8
\|\ \| \| \| \| \| \| \| \|	Instrument MergeRequestDiff#load_commits See merge request !12162
\| *	Instrument MergeRequestDiff#load_commitsinstrument-merge-request-diff-load-commits	Sean McGivern	2017-06-14	3	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This instrumentation isn't needed strictly for performance measurements, but just to see which controller actions call this method at all. See <https://gitlab.com/gitlab-org/gitlab-ce/issues/30224#note_32306159> for more details.
* \|	Merge branch 'dm-fix-parser-cache' into 'master'	Sean McGivern	2017-06-15	3	-2/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Don't return nil for missing objects from parser cache See merge request !12168
\| * \|	Don't return nil for missing objects from parser cachedm-fix-parser-cache	Douwe Maan	2017-06-14	3	-2/+6
\| \| \|
* \| \|	Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'	Phil Hughes	2017-06-15	2	-3/+70
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix note highlight being lost after real time update Closes #33483 See merge request !12098
\| * \| \|	Fix note highlight being lost after real time update	Eric Eastwood	2017-06-14	2	-3/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33483
* \| \| \|	Merge branch '32861-fix-milestone-drag-and-drop-assignees' into 'master'	Phil Hughes	2017-06-15	2	-11/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix milestone page assignees when dropped in ongoing list Closes #32861 See merge request !12076
\| * \| \| \|	Fix milestone page assignees when dropped in ongoing list	Eric Eastwood	2017-06-14	2	-11/+23
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32861
* \| \| \|	Merge branch 'dm-target-branch-slash-command-desc' into 'master'	Robert Speicher	2017-06-14	2	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update /target_branch slash command description to be more consistent See merge request !12175
\| * \| \| \|	Update /target_branch slash command description to be more consistentdm-target-branch-slash-command-desc	Douwe Maan	2017-06-14	2	-1/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-fix-codeclimate-build' into 'master'	Douwe Maan	2017-06-14	2	-2/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Require rubocop-rspec in the correct location See merge request !12174
\| * \| \| \| \|	Require rubocop-rspec in the correct locationrs-fix-codeclimate-build	Robert Speicher	2017-06-14	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves the `codeclimate` CI failure
* \| \| \| \| \|	Remove extra line so that it is consistent with EE	Clement Ho	2017-06-14	1	-1/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' ↵	Clement Ho	2017-06-14	2	-1/+18
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix autocomplete not working on note edit form Closes #33529 See merge request !12106
\| * \| \| \| \|	Fix autocomplete not working on note edit form	Eric Eastwood	2017-06-14	2	-1/+18
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33529 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11278
* \| \| \| \|	Merge branch 'pipelines-row-vue-file-fix' into 'master'	Annabel Dunstone Gray	2017-06-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed pipelines Vue template not ending correctly See merge request !12170
\| * \| \| \| \|	Fixed pipelines Vue template not ending correctlypipelines-row-vue-file-fix	Phil Hughes	2017-06-14	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge branch 'winh-select2-remove-token' into 'master'	Annabel Dunstone Gray	2017-06-14	1	-2/+4
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move remove token of Select2 to the right See merge request !12101
\| * \| \| \|	Move remove token of Select2 to the right	winh	2017-06-14	1	-2/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-single-line-rspec-hook-cop' into 'master'	Douwe Maan	2017-06-14	209	-633/+2051
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a custom RSpec/SingleLineHook cop Closes #24891 See merge request !11911
\| * \| \| \| \|	Enable RSpec/SingleLineHook cop	Robert Speicher	2017-06-14	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Correct RSpec/SingleLineHook cop offenses	Robert Speicher	2017-06-14	205	-633/+1940
\| \| \| \| \| \|
\| * \| \| \| \|	Add a custom RSpec/SingleLineHook cop	Robert Speicher	2017-06-14	4	-0/+111
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This cop adds an offense when `before`, `after`, or `around` are used as single-line blocks.
* \| \| \| \|	Merge branch '31263-fix-fenced-code-misalignment-with-activity' into 'master'	Annabel Dunstone Gray	2017-06-14	1	-1/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix fenced code block misalignment in events/activity Closes #31263 See merge request !12149
\| * \| \| \| \|	Fix fenced code block misalignment in events/activity31263-fix-fenced-code-misalignment-with-activity	Eric Eastwood	2017-06-13	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31263 `.event-item` is only used within the `events/_event` partial. `.event-note` is only used within the `events/event/_common`(but no markdown) and `events/event/_note` partials. The fenced code `pre` style is scoped to `.event-item .event-note` Pages where events are used - User profile, ex. `/root` - Group Activity, ex. `/groups/foo/activity` - Project Activity, ex. `/foo/bar/activity
* \| \| \| \| \|	Merge branch 'dz-add-codeclimate-job' into 'master'	Dmitriy Zaporozhets	2017-06-14	2	-3/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add codeclimate job to .gitlab-ci.yml See merge request !12086
\| * \| \| \| \| \|	Exclude more path from codeclimate job	Dmitriy Zaporozhets	2017-06-14	2	-15/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Improve codeclimate.yml to avoid timeouts	Dmitriy Zaporozhets	2017-06-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Add codeclimate job to .gitlab-ci.yml	Dmitriy Zaporozhets	2017-06-14	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Add yarn cache to code climate ignore list	Dmitriy Zaporozhets	2017-06-14	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch '32470-pag-links' into 'master'	Annabel Dunstone Gray	2017-06-14	2	-3/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	more visual contrast for active page in pagination widget Closes #32470 See merge request !12119
\| * \| \| \| \| \| \|	more visual contrast for active page in pagination widget32470-pag-links	Simon Knox	2017-06-13	2	-3/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'help-landing-page-customizations' into 'master'	Douwe Maan	2017-06-14	16	-14/+129
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow more customization to Help landing page See merge request !11878
\| * \| \| \| \| \| \|	Help landing page customizations	Robin Bobbitt	2017-06-14	13	-14/+108
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Help landing page customizations - db changes	Robin Bobbitt	2017-06-13	3	-0/+21
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dm-diff-viewers' into 'master'	Sean McGivern	2017-06-14	40	-39/+1153
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement diff viewers Closes #30501 and #19931 See merge request !11777
\| * \| \| \| \| \| \| \|	Implement diff viewers	Douwe Maan	2017-06-14	40	-39/+1153
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '2525-backport-kubernetes-service-changes' into 'master'	Kamil Trzciński	2017-06-14	5	-57/+107
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport EE changes to the Kubernetes service Closes gitlab-ee#2525 See merge request !12139
\| * \| \| \| \| \| \|	Backport EE changes to the Kubernetes service	Nick Thomas	2017-06-14	5	-57/+107
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '33149-rename-more-builds' into 'master'	Kamil Trzciński	2017-06-14	4	-200/+202
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix raw_path with the new job path, rename builds to jobs in test Closes #33149 See merge request !11941
\| * \| \| \| \| \| \|	Fix other renaming	Lin Jen-Shin	2017-06-14	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds	Lin Jen-Shin	2017-06-14	117	-393/+1485
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (34 commits) Revert "Merge branch 'karma-headless-chrome' into 'master'" Make small pipeline schedules UI enhancements. Remove js classes from vue component that are not needed in vue component Update tests and application Adds "Pipeline" to job's sidebar Change border color of job's scroll controllers to $border-color Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone' Added Tectonic to the page. Always check read_issue permissions when loading issue Handle legacy jobs without name Do not expose internal artifacts hash in build entity Use wait_for_requests instead of sleep 0.3 Limit wiki container width Fix migrations testing support RSpec hooks order Rename BuildEntity to JobEntity Fix support for external_url for commit statuses Allow to access pipelines even if they are disabled, but only present jobs and commit statuses without giving ability to access them add CHANGELOG.md entry for !12036 remove phantomjs-specific test hacks update karma job to use chrome build image created by gitlab-build-images!41 ...
\| * \| \| \| \| \| \| \|	Fix other renaming	Lin Jen-Shin	2017-06-14	1	-11/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds33149-rename-more-builds	Lin Jen-Shin	2017-06-13	843	-4496/+15172
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (460 commits) Center dropdown for pipeline's mini graph Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions Fix filename method of GitlabUploader to return always real filename Ignore CVE-2017-5029 in Nokogiri Refactor atom builder by using xml.atom layout Let PhantomJS load local images Add a changelog entry Only add a description change note when no tasks are updated Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as the upgrade fails with Go 1.5 (installed with Gitlab 8.1) Use gitaly 0.11.2 Add the ability to perform background migrations Always render warnings icon in orange Fix a few translation for zh_TW Improve Job detail view to make it refreshed in real-time instead of reloading Attempts to run RSpec tests twice (1 retry) ignore name validation on importing Only show hover state on links and buttons Use vue files for navigation tabs and buttons doc: add example of scheduler when Add test for u2f helper and changelog entry ...
\| * \| \| \| \| \| \| \| \|	Fix raw_path with the new job path, rename to job	Lin Jen-Shin	2017-06-06	4	-195/+197
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in the tests
* \| \| \| \| \| \| \| \| \|	Merge branch 'zj-raise-etag-route-regex-miss' into 'master'	Kamil Trzciński	2017-06-14	7	-56/+36
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise etag route regex miss Closes #33106 See merge request !12084
\| * \| \| \| \| \| \| \| \| \|	Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-miss	Z.J. van de Weg	2017-06-12	5	-55/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was edited to the request, but this won't work if the data is not available at the time of setting the key for the first time.
\| * \| \| \| \| \| \| \| \| \|	Fix etag route misses	Z.J. van de Weg	2017-06-12	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitlab-org/gitlab-ce#33106
\| * \| \| \| \| \| \| \| \| \|	Raise exception on invalid pipeline cache	Kamil Trzcinski	2017-06-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|