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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Restart PhantomJS on timeout errors. #4662issue_4662	Rubén Dávila	2015-12-27	1	-0/+31
\|
*	Precompile assets before running feature specs. #4662	Rubén Dávila	2015-12-27	1	-0/+1
\|
*	Merge branch 'fix-mr-500' into 'master'	Robert Speicher	2015-12-22	4	-2/+38
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR 500 when viewing the MR page Fixes #2712 See merge request !2167
\| *	Move `ci_build_details_path` helper spec to correct location	Robert Speicher	2015-12-21	2	-22/+20
\| \| \| \| \| \| \| \|	Also, make it not fail.
\| *	Update CHANGELOGfix-mr-500	Kamil Trzcinski	2015-12-22	1	-0/+2
\| \|
\| *	Deprecate GitLabCiService making it to always be inactive	Kamil Trzcinski	2015-12-22	1	-1/+6
\| \|
\| *	ci_build_details_path should return nil if builds_page result is nil	Kamil Trzcinski	2015-12-22	1	-0/+2
\| \| \| \| \| \| \| \|	This is required since we parse URI later and remove the credentials
\| *	removes api credentials from link to build_page	Marvin Frick	2015-12-22	2	-1/+30
\| \| \| \| \| \| \| \| \| \|	Also adds a spec for MergeRequestHelper to avoid having a regression later on.
* \|	Merge branch 'rs-bump-nokogiri' into 'master'	Robert Speicher	2015-12-22	2	-1/+5
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explicitly require Nokogiri 1.6.7.1 due to security issue ``` Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1 ``` See merge request !2154
\| *	Explicitly require Nokogiri 1.6.7.1 due to security issuers-bump-nokogiri	Robert Speicher	2015-12-18	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1
* \|	Add 8.4.0 to CHANGELOG	Robert Speicher	2015-12-21	1	-2/+3
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'contributing-grabs-fix' into 'master'	Robert Speicher	2015-12-21	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed wrong URL to "up for grabs" issue filter [ci skip] See merge request !2162
\| * \|	Fixed wrong URL to "up for grabs" issue filter	Laurens Stötzel	2015-12-21	1	-1/+1
\| \| \|
* \| \|	Merge branch 'admin_add_identity' into 'master'	Robert Speicher	2015-12-21	4	-2/+22
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow admin to create new user identities Fixes #2442 See merge request !2077
\| * \| \|	Allow admin to create new user identities	Drew Blessing	2015-12-15	4	-2/+22
\| \| \| \|
* \| \| \|	Merge branch 'fix-issue-related-mrs' into 'master'	Robert Speicher	2015-12-21	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue related cross-project MRs Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4188 See merge request !2163
\| * \| \| \|	Fix issue related cross-project MRsfix-issue-related-mrs	Douwe Maan	2015-12-21	2	-2/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'add_email_unlock' into 'master'	Robert Speicher	2015-12-21	10	-21/+35
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow account unlock via email We see a lot of users get confused about what it means when your account gets locked. Many try to reset their password and are still faced with a lockout. With this change, users receive an email that allows them to unlock their account immediately. The previous behavior where the account is auto-unlocked after a time also still works. See merge request !2049
\| * \| \| \|	Allow account unlock via email	Drew Blessing	2015-12-14	10	-21/+35
\| \| \| \| \|
* \| \| \| \|	Merge branch 'issue_3452'	Douwe Maan	2015-12-21	4	-0/+79
\|\ \ \ \ \
\| * \| \| \| \|	Add changelog item	Douwe Maan	2015-12-21	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix Rubocop complain.issue_3452	Rubén Dávila	2015-12-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix broken spec. #3452	Rubén Dávila	2015-12-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add link to MR from Build detail page. #3452	Rubén Dávila	2015-12-16	3	-0/+78
\| \| \| \| \| \|
* \| \| \| \| \|	Move changelog item	Douwe Maan	2015-12-21	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'tduehr/gitlab-ce-cas-support'	Douwe Maan	2015-12-21	11	-1/+144
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add link to CAS doc	Douwe Maan	2015-12-21	2	-3/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add CAS authentication support	tduehr	2015-12-14	10	-1/+143
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'git-version' into 'master'	Douwe Maan	2015-12-21	3	-0/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show git version on admin page Before ![git-version-beore](/uploads/57444ad42220c9dfe8f187b8e399227f/git-version-beore.png) After ![git-version-after](/uploads/cc1b52ae1a251c2c46d9626c040726ab/git-version-after.png) gitlab-org/gitlab-ce#4077 See merge request !2101
\| * \| \| \| \| \|	Show git version on admin page	Trey Davis	2015-12-15	3	-0/+10
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'coverage-regex' into 'master'	Douwe Maan	2015-12-21	2	-1/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix build coverage regex matching to allow captures. Fixes #2644 /cc @DouweM See merge request !2138
\| * \| \| \| \| \|	Fix build coverage regex.	Jared Szechy	2015-12-20	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a spec for regex captures as well. Fixes #2644
\| * \| \| \| \| \|	Fix build coverage regex matching to allow captures.	Jared Szechy	2015-12-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2644
* \| \| \| \| \| \|	Merge branch 'backport_jira' into 'master'	Dmitriy Zaporozhets	2015-12-21	31	-20/+875
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport JIRA service Fixes #3839 Move EE JIRA functionality back to CE. - [x] Make it function in manual testing - [x] Migrate JIRA-specific tests - [x] Tests pass - [x] Migrate documentation - [x] Rollback to previous CE JIRA integration locally, activate on a project then try to migrate db and see if integration still works. - [x] Final EE search for JIRA references See merge request !2146
\| * \| \| \| \| \|	Backport JIRA service	Drew Blessing	2015-12-18	31	-20/+875
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'removeNonDefinedVariableFromCIDoc' into 'master'	Achilleas Pipinellis	2015-12-19	1	-2/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove CI_BUILD_BEFORE_SHA from CI documentation As pointed in #3210, the environment variable isn't usable any more. See merge request !2118
\| * \| \| \| \| \| \|	Remove CI_BUILD_BEFORE_SHA from CI documentation	Cauan Cabral	2015-12-16	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As pointed in #3210, the environment variable isn't usable any more.
* \| \| \| \| \| \| \|	Merge branch 'update_artifact_runner_docs' into 'master'	Achilleas Pipinellis	2015-12-19	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify Windows shell executor artifact upload support @ayufan noted that the runner does not support artifact upload for Windows shell executor. This adds a note so users aren't confused. See merge request !2142
\| * \| \| \| \| \| \|	Clarify Windows shell executor artifact upload support	Drew Blessing	2015-12-17	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ci-commit-status-skipped' into 'master'	Grzegorz Bizon	2015-12-18	7	-43/+36
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled Fixes #3827 Fixes #4157 /cc @grzesiek @dblessing See merge request !2139
\| * \| \| \| \| \| \| \|	Fix feature specs: we always show the build status if ci_commit is presentci-commit-status-skipped	Kamil Trzcinski	2015-12-17	1	-23/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if ↵	Kamil Trzcinski	2015-12-17	6	-20/+30
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the builds are enabled
* \| \| \| \| \| \| \|	Merge branch 'reference_clean_up' into 'master'	Robert Speicher	2015-12-18	1	-3/+4
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not display project group/name when issue and MR are in same project I noticed that things seem a bit cluttered for related merge requests when displaying the group/project name for every item, even when it's in the same project. For merge requests that are in the same project as the issue we probably don't need to display the 'in group / name' bit. See merge request !2141
\| * \| \| \| \| \| \|	Do not display project group/name when issue and MR are in same project	Drew Blessing	2015-12-17	1	-3/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'update-rack-attack-security' into 'master'	Robert Speicher	2015-12-18	3	-3/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Rack Attack to v4.3.1 for security fix https://github.com/kickstarter/rack-attack/releases/tag/v4.3.1 See merge request !2153
\| * \| \| \| \| \| \| \|	Bump Rack Attack to v4.3.1 for security fix	Stan Hu	2015-12-18	3	-3/+4
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/kickstarter/rack-attack/releases/tag/v4.3.1
* \| \| \| \| \| \| \|	Merge branch 'remove-extra-spaces' into 'master'	Robert Speicher	2015-12-18	1	-8/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra spaces after branchname See merge request !2152
\| * \| \| \| \| \| \| \|	Remove extra spaces after branchname	Zeger-Jan van de Weg	2015-12-18	1	-8/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/mr-reopen-button-title' into 'master'	Grzegorz Bizon	2015-12-18	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix merge-request-reopen button title Closes #4069 See merge request !2147
\| * \| \| \| \| \| \| \| \|	Fix merge-request-reopen button titlefix/mr-reopen-button-title	Grzegorz Bizon	2015-12-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4069