Commit message (Expand) | 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 |
|\ | |||||
| * | Move `ci_build_details_path` helper spec to correct location | Robert Speicher | 2015-12-21 | 2 | -22/+20 |
| * | 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 |
| * | removes api credentials from link to build_page | Marvin Frick | 2015-12-22 | 2 | -1/+30 |
* | | 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 issuers-bump-nokogiri | Robert Speicher | 2015-12-18 | 2 | -1/+5 |
* | | Add 8.4.0 to CHANGELOG | Robert Speicher | 2015-12-21 | 1 | -2/+3 |
* | | Merge branch 'contributing-grabs-fix' into 'master' | Robert Speicher | 2015-12-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | 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 | 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 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 | 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 | 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. | Jared Szechy | 2015-12-20 | 2 | -1/+8 |
| * | | | | | | Fix build coverage regex matching to allow captures. | Jared Szechy | 2015-12-17 | 1 | -1/+1 |
* | | | | | | | Merge branch 'backport_jira' into 'master' | Dmitriy Zaporozhets | 2015-12-21 | 31 | -20/+875 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | 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 | Cauan Cabral | 2015-12-16 | 1 | -2/+0 |
* | | | | | | | | Merge branch 'update_artifact_runner_docs' into 'master' | Achilleas Pipinellis | 2015-12-19 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 the... | Kamil Trzcinski | 2015-12-17 | 6 | -20/+30 |
| |/ / / / / / / | |||||
* | | | | | | | | 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 | 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 | Stan Hu | 2015-12-18 | 3 | -3/+4 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'remove-extra-spaces' into 'master' | Robert Speicher | 2015-12-18 | 1 | -8/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 titlefix/mr-reopen-button-title | Grzegorz Bizon | 2015-12-18 | 1 | -3/+3 |