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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move spec to proper place and fix unused variablerefactor-complex-methods	Dmitriy Zaporozhets	2015-11-13	2	-1/+0
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Don't allow flog failure any more	Dmitriy Zaporozhets	2015-11-13	1	-1/+0
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Even more refactoring to inline_diff.rb	Dmitriy Zaporozhets	2015-11-13	1	-16/+23
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Split complex methods in GoogleCodeImport::Importer	Dmitriy Zaporozhets	2015-11-13	1	-46/+47
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Split complex Gitlab::InlineDiff::processing method	Dmitriy Zaporozhets	2015-11-13	1	-19/+36
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Split complex method EventsHelper#event_feed_url.	Dmitriy Zaporozhets	2015-11-13	1	-11/+15
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Split complex method Issues::UpdateService#execute	Dmitriy Zaporozhets	2015-11-13	1	-13/+16
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Split complex method SystemHooksService#build_event_data	Dmitriy Zaporozhets	2015-11-13	1	-30/+42
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Split huge method MergeRequests::UpdateService#execute	Dmitriy Zaporozhets	2015-11-13	1	-22/+25
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'use-path-for-new-issue-button' into 'master'	Dmitriy Zaporozhets	2015-11-12	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use a relative link instead of full URL with New Issue button to be consistent Relates to #3095 See merge request !1631
\| *	Use a relative link instead of full URL with New Issue button to be consistent	Stan Hu	2015-10-17	1	-1/+1
\| \| \| \| \| \| \| \|	Relates to #3095
* \|	Merge branch 'fix-avatar-not-showing' of https://gitlab.com/stanhu/gitlab-ce	Dmitriy Zaporozhets	2015-11-12	5	-4/+5
\|\ \
\| * \|	Fix avatars not showing in Atom feeds and project issues when Gravatar disabled	Stan Hu	2015-11-10	5	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Fix for https://github.com/gitlabhq/gitlabhq/pull/9783
* \| \|	Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list	Dmitriy Zaporozhets	2015-11-12	9	-24/+18
\|\ \ \ \| \| \| \| \| \| \| \|	Avoid render edit_form in each notes.
\| * \| \|	Avoid render edit_form in each notes.	Jason Lee	2015-11-12	9	-24/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use RJS to render edit note feature. Before: ``` Rendered projects/notes/_note.html.haml (27.9ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.7ms) Rendered projects/_md_preview.html.haml (3.9ms) Rendered projects/notes/_edit_form.html.haml (6.9ms) Rendered projects/notes/_note.html.haml (17.7ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.6ms) Rendered projects/_md_preview.html.haml (3.4ms) Rendered projects/notes/_edit_form.html.haml (7.0ms) ``` After: ``` Rendered projects/notes/_note.html.haml (13.8ms) Rendered projects/notes/_note.html.haml (7.1ms) Rendered projects/notes/_note.html.haml (9.5ms) Rendered projects/notes/_note.html.haml (8.5ms) ``` This change reduce at least 6ms * N ('N' - number of notes).
* \| \| \|	Merge branch 'ci-deprecate-dumped-yaml' into 'master'	Kamil Trzciński	2015-11-12	4	-24/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated dumped yaml file generated from previous job definitions See merge request !1777
\| * \| \| \|	Remove deprecated dumped yaml file generated from previous job definitionsci-deprecate-dumped-yaml	Kamil Trzcinski	2015-11-10	4	-24/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix_project_build_links' into 'master'	Kamil Trzciński	2015-11-12	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "Other Builds" links in Projects Build page Found a minor issue where all links in the "Other Builds" section of Project Builds was linking to the same build #. This should fix it. See merge request !1785
\| * \| \| \| \|	fix build link	Andy Brandt	2015-11-10	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'caches' into 'master'	Kamil Trzciński	2015-11-12	4	-4/+175
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to define cache in `.gitlab-ci.yml` This extends `.gitlab-ci.yml` syntax to allow specifying caching files and directories between builds, making it easy to preserve ex. gems. ``` cache: paths: - .bundle - vendor/ before_script: - bundle install --path vendor/ rspec: script: - bundle exec rspec ``` This is based on Build Artifacts changes. /cc@dzaporozhets See merge request !1786
\| * \| \| \| \| \|	Allow to define cache in `.gitlab-ci.yml`caches	Kamil Trzcinski	2015-11-10	4	-4/+175
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'flay' into 'master'	Dmitriy Zaporozhets	2015-11-11	5	-0/+23
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add flay: tool to find duplicate code Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1789
\| * \| \| \| \| \| \|	Add flay: tool to find duplicate codeflay	Dmitriy Zaporozhets	2015-11-11	5	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Robert Speicher	2015-11-11	1	-1/+2
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch ↵	Dmitriy Zaporozhets	2015-11-11	1	-1/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'add-comment-to-one-link-in-email-to-prevent-people-adding-it-back' into 'master' Prevent people from adding the link back. See merge request !1938
\| \| * \| \| \| \| \| \| \|	Fix typo in email comment: hone -> one	Dmitriy Zaporozhets	2015-11-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Prevent people from adding the link back.	Sytse Sijbrandij	2015-11-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Update CHANGELOG	Robert Speicher	2015-11-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'flog' into 'master'	Dmitriy Zaporozhets	2015-11-11	4	-0/+38
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add method complexity check to CI Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1783
\| * \| \| \| \| \| \| \| \|	Allow flog failure for now	Dmitriy Zaporozhets	2015-11-11	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Add method complexity check to CIflog	Dmitriy Zaporozhets	2015-11-10	4	-0/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'recent-scope-ordering' into 'master'	Yorick Peterse	2015-11-11	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change "recent" scopes to sort by "id" These scopes can just sort by the "id" column in descending order to achieve the same result. An added benefit is being able to perform a backwards index scan (depending on the rest of the final query) instead of having to actually sort data. See merge request !1788
\| * \| \| \| \| \| \| \| \|	Change "recent" scopes to sort by "id"	Yorick Peterse	2015-11-11	2	-2/+2
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These scopes can just sort by the "id" column in descending order to achieve the same result. An added benefit is being able to perform a backwards index scan (depending on the rest of the final query) instead of having to actually sort data.
* \| \| \| \| \| \| \| \|	Merge branch 'artifacts' into 'master'	Kamil Trzciński	2015-11-11	46	-25/+786
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement Build Artifacts This implements #3028 1. It stores artifacts in shared/artifacts, 1. It adds `artifacts` to `.gitlab-ci.yml`, 1. We use GitLab Workhorse to offload artifacts uploading, 1. To download artifacts it uses GitLab Workhorse X-Sendfile extension, 1. There's one "artifact" per-build. The new upload removes previous one and creates a new one, 1. Default max artifact size is set to 100MB - this can be changed in settings. Missing things: 1. Support for `.gitlab-ci.yml`: `artifacts: true or git-ls-files` which will upload all non tracked files, 1. Artifacts passing between builds. GitLab Workhorse changes: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/5 GitLab Runner changes: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/46 Syntax: ``` artifacts: untracked: true # default: false paths: # default: empty - bin/files ``` See merge request !1584
\| * \| \| \| \| \| \| \|	Fix testsartifacts	Kamil Trzcinski	2015-11-10	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Final fixes	Kamil Trzcinski	2015-11-10	3	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use normal file upload mechanism to upload artifacts	Kamil Trzcinski	2015-11-10	3	-23/+34
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix nginx config to use @gitlab-workhorse	Kamil Trzcinski	2015-11-10	2	-8/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move tmp artifacts to shared/artifacts/tmp/. Check for GitLab-Workhorse now	Kamil Trzcinski	2015-11-10	7	-8/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Change artifacts syntax to allow uploading untracked files	Kamil Trzcinski	2015-11-10	3	-11/+49
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Implement Build Artifacts	Kamil Trzcinski	2015-11-10	46	-24/+740
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Offloads uploading to GitLab Workhorse - Use /authorize request for fast uploading - Added backup recipes for artifacts - Support download acceleration using X-Sendfile
* \| \| \| \| \| \| \|	Merge branch 'ci-build-name-in-notification-email' into 'master'	Kamil Trzciński	2015-11-10	5	-0/+13
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send build name and stage in CI notification e-mail See merge request !1776
\| * \| \| \| \| \| \|	Send build name and stage in CI notification e-mailci-build-name-in-notification-email	Kamil Trzcinski	2015-11-10	5	-0/+13
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'add-allow-failure-status' into 'master'	Stan Hu	2015-11-10	4	-4/+9
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add allow_failure field to commit status API Closes #3196 See merge request !1685
\| * \| \| \| \| \|	Add allow_failure field to commit status API	Stan Hu	2015-11-03	4	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3196
* \| \| \| \| \| \|	Update CHANGELOG	Robert Speicher	2015-11-10	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge pull request #9818 from mavimo/patch-6	Robert Speicher	2015-11-10	1	-2/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicate entry for 8.1.0 release
\| * \| \| \| \| \| \|	Fix duplicate entry for 8.1.0 release	Marco Vito Moscaritolo	2015-11-10	1	-2/+0
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicate entry for 8.1.0 release and remove unreleased tag.
* \| \| \| \| \| \|	Merge branch 'fix-drone-ci-template-save' into 'master'	Stan Hu	2015-11-10	2	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Drone CI service template not saving properly This fixes an Error 500 when attempting to save a Drone CI template in the service template page. `hook.url` was not being used and depended upon a project when none existed. /cc: @bugagazavr Closes #3419 See merge request !1774
\| * \| \| \| \| \|	Fix Drone CI service template not saving properly	Stan Hu	2015-11-10	2	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #3419