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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Only create unmergeable todos onceonly-create-unmergeable-todo-once	Sean McGivern	2017-02-24	5	-11/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, we created an unmergeable todo when a merge request: 1. Had merge when pipeline succeeds set. 2. Became unmergeable. However, when merge when pipeline succeeds fails due to unmergeability, the flag isn't actually removed. And a merge request can become unmergeable multiple times, as every time the target branch is updated we need to re-check the mergeable status. This means that if the todo was marked done, and the MR was checked again, a new todo would be created for the same event. Instead of checking this, we should create the todo from the service responsible for merging when the pipeline succeeds. That way the todo is guaranteed to only be created when we care about it.
*	Merge branch 'issue-28653-2' into 'master'	Douwe Maan	2017-02-24	1	-5/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Use persistent name identifier instead of transient in SAML2 documentation Closes #28653 See merge request !9504
\| *	Use persistent name identifier instead of transient in SAML2 documentation	Lukas Raska	2017-02-24	1	-5/+5
\| \|
* \|	Merge branch '3874-correctly-return-json-on-delete-responses' into 'master'	Sean McGivern	2017-02-24	9	-5/+51
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return 202 with JSON body on async removals on V4 API Closes #3874 See merge request !9449
\| * \|	Return 202 with JSON body on async removals on V4 API3874-correctly-return-json-on-delete-responses	Oswaldo	2017-02-23	9	-5/+51
\| \| \|
* \| \|	Merge branch '27762-add-default-artifacts-expiration' into 'master'	Kamil Trzciński	2017-02-24	18	-16/+178
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Artifact Expiration Defaults Closes #27762 See merge request !9219
\| * \| \|	Introduce DurationValidator, feedback:27762-add-default-artifacts-expiration	Lin Jen-Shin	2017-02-24	2	-8/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_24032923
\| * \| \|	Test against default to '0', it should not set	Lin Jen-Shin	2017-02-24	1	-8/+22
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-24	809	-3927/+8396
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	27762-add-default-artifacts-expiration * upstream/master: (247 commits) Switched CONTRIBUTING.md style guide recommendation for method chaining Fix new offenses Stylistic tweaks Fix OAuth/SAML user blocking behavior Revert "Enable Style/DotPosition" Revert "Prefer leading style for Style/DotPosition" Revert "Enable Style/BarePercentLiterals" Manually correct autocorrect Move up delegate calls Exclude migrations from Style/MutableConstant ActiveSupport delegation is preferred over Forwardable Update haml_lint to work with newest rubocop Add explanations to cops Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Order cops alphabetically Don’t exclude some file in lib from rubocop Fix new offenses Enable Rails/Delegate Enable Style/WordArray ...
\| * \| \|	Remove syntax help link and update screenshot	Lin Jen-Shin	2017-02-22	2	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23943262
\| * \| \|	Fix tests due to error key changed	Lin Jen-Shin	2017-02-21	2	-2/+2
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-21	52	-234/+681
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	27762-add-default-artifacts-expiration * upstream/master: (26 commits) Allow searching issues for strings containing colons Fix Spinach failure [ci skip] UX Guide: Add personas Reuse User#find_by_any_email on UserFormatter#find_by_email Use leading periods on UserFormatter#find_by_external_uid Add CHANGELOG entry Add a simple cache for Gitlab::GithubImport::Client#user GitHub Importer - Find users based on their email address Don't use potentially slow ForkService in spec Added support for Authentiq Back-Channel Logout Added documentation for permalinks to most recent build artifacts Unify issues search behavior by always filtering when ALL labels matches Update GitLab Pages to v0.3.1 Document Timecop usage for time-sensitive tests Add process for requesting approval for licenses Rename karma job to rake karma Update positioning of nav scroll arrows Fix issue where files on a fork could not be edited Move tanuki to left of title; increase max-width of title Refactor project stats & last_commit CSS; left align main nav items ...
\| * \| \| \|	Update doc according to the new syntax	Lin Jen-Shin	2017-02-21	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add screenshot for default artifacts expiration,	Lin Jen-Shin	2017-02-21	2	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and update screenshot for maximum artifacts size.
\| * \| \| \|	Update error message and check with presence: true	Lin Jen-Shin	2017-02-21	1	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23762243 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23762268
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-21	542	-4164/+6509
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	27762-add-default-artifacts-expiration * upstream/master: (234 commits) Improve performance of User Agent Detail Fix some grammar in the API docs Remove shared example for pagination API: Use POST to (un)block a user API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` Use grape validation for dates Change wording for LDAP doc that was moved to a new location API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable` Download snippets with LF line-endings by default utilize pre-minified Vue in production since no CJS distribution is available Prevent project team from being truncated too early during project destruction loading icon sometimes toggled alongside MR pipeline contents fix failed spec because haml_lint fix incorrect sidekiq concurrency count in admin background page exclude rpc_pipefs from system disc info Fix wrong line ending [ci-skip] fix overlooked window binding in spec files remove imports loader replace implicit this == window with explicit binding Todo done clicking is kind of unusable. ...
\| * \| \| \| \|	0 for unlimited, disallow blank, feedback:	Lin Jen-Shin	2017-02-16	8	-35/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/27762#note_23520780
\| * \| \| \| \|	The exception was no longer used	Lin Jen-Shin	2017-02-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Wordings change, feedback:	Lin Jen-Shin	2017-02-16	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23437712
\| * \| \| \| \|	Use squish to also compact the string	Lin Jen-Shin	2017-02-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23436980
\| * \| \| \| \|	Use static error message and don't give booleans	Lin Jen-Shin	2017-02-16	2	-9/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in validation. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23437431 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23437868
\| * \| \| \| \|	Update schema	Lin Jen-Shin	2017-02-16	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-16	213	-1275/+1796
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	27762-add-default-artifacts-expiration * upstream/master: (37 commits) Show merge errors in merge request widget Clarify that stage is needed to stop environments Fix broken link in university docs allow clicking on text or icon to trigger expand style links on system notes to look clickable Clean up terms used for issues. Use New instead of Add. Fix most of broken docs links Set `Auto-Submitted: auto-generated` header to emails Fix Rubocop offense Fix regression where cmd-click stopped working for todos and merge request tabs Remove changelog entries for 8.16.5 release Merge branch 'fix-github-import-MR-wrong-project' into 'security' Merge branch 'svg-xss-fix' into 'security' Merge branch 'fix-rdoc-xss' into 'security' Merge branch 'asciidoctor-xss-patch' into 'security' Specify that only project owners can transfer a project only load istanbul plugin in development mode Make Karma output look nicer for CI (!9165) Centers loading icon vertically and horizontally in pipelines table in commit view Rename builds to jobs in docs ...
\| * \| \| \| \| \|	Update docs to reflect current behaviour	Lin Jen-Shin	2017-02-15	3	-7/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix tests and disallow 0 to make it consistent with .gitlab-ci.yml	Lin Jen-Shin	2017-02-15	4	-4/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add a few more tests and make sure empty value sets to nil	Lin Jen-Shin	2017-02-15	3	-2/+39
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Check default_artifacts_expire_in only if existed	Lin Jen-Shin	2017-02-15	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	rubocop: Align the operands of an expression	Lin Jen-Shin	2017-02-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	C: Style/MultilineOperationIndentation: Align the operands of an expression in an assignment spanning multiple lines.
\| * \| \| \| \| \|	Use the same syntax for default expiration	Lin Jen-Shin	2017-02-15	8	-36/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23343951 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23344036 * https://gitlab.com/gitlab-org/gitlab-ce/issues/27762#note_23344797
\| * \| \| \| \| \|	Test build API if expire_in not set, set to app default	Lin Jen-Shin	2017-02-15	1	-2/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add changelog entry	Lin Jen-Shin	2017-02-15	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	ApplicationSetting.current doesn't work well in tests	Lin Jen-Shin	2017-02-15	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Therefore we prefer `Gitlab::CurrentSettings.current_application_settings` and fix the tests by setting default_artifacts_expire_in to 0 to restore the original behaviour.
\| * \| \| \| \| \|	Initial implementation for default artifacts expiration	Lin Jen-Shin	2017-02-15	9	-11/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TODO: Add tests and screenshots
* \| \| \| \| \| \|	Merge branch 'patch-15' into 'master'	Grzegorz Bizon	2017-02-24	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed instructions for adding Secret Variables to a CI/CD pipeline. See merge request !9480
\| * \| \| \| \| \| \|	Fixed instructions for adding Secret Variables to a CI/CD pipeline.	J. B. Rainsberger	2017-02-23	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '27530-fix-job-dropdown-pipeline-console-error' into 'master'	Fatih Acet	2017-02-24	3	-14/+38
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes job dropdown action button error Closes #27530 See merge request !9182
\| * \| \| \| \| \| \|	Prevent propagation of click even in job name inside dropdown.27530-fix-job-dropdown-pipeline-console-error	Filipa Lacerda	2017-02-23	2	-12/+32
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	adds mount function with prevent and removes keepGraph function	Nur Rony	2017-02-23	1	-20/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixes job dropdown action button error	Nur Rony	2017-02-23	2	-6/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'create_branch_repo_less' into 'master'	Robert Speicher	2017-02-23	6	-5/+101
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create master branch first if project is repository-less Closes #26687 See merge request !9009
\| * \| \| \| \| \| \|	Fixes after reviewcreate_branch_repo_less	Valery Sizov	2017-02-23	5	-26/+33
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	update changelog	Valery Sizov	2017-02-23	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Create master branch first if project is repository-less	Valery Sizov	2017-02-23	4	-5/+90
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '27989-disable-counting-tags' into 'master'	Rémy Coutable	2017-02-23	4	-4/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable unused tags count cache for Projects, Builds and Runners Closes #27989 See merge request !9467
\| * \| \| \| \| \| \| \|	Disable unused tags count cache for Projects, Builds and Runners	Pawel Chojnacki	2017-02-23	4	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ remove complete leftover when Issues were tagged using acts_as_taggable
* \| \| \| \| \| \| \| \|	Merge branch 'enable-rspec-be_eql-cop' into 'master'	Robert Speicher	2017-02-23	4	-8/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable the RSpec/BeEql cop See merge request !9476
\| * \| \| \| \| \| \| \| \|	Enable the RSpec/BeEql copenable-rspec-be_eql-cop	Rémy Coutable	2017-02-23	4	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch '28610-white-square-nav' into 'master'	Filipa Lacerda	2017-02-23	1	-6/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix white square and sidebar animation Closes #28610 See merge request !9472
\| * \| \| \| \| \| \| \| \| \|	Fix white square and sidebar animation28610-white-square-nav	Annabel Dunstone Gray	2017-02-23	1	-6/+10
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jej-contributing-styleguide-for-method-chaining' into 'master'	Robert Speicher	2017-02-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switched CONTRIBUTING.md style guide recommendation for method chaining [ci skip] See merge request !9483