summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/ci-runners-token-persistence' into 'master' Grzegorz Bizon2015-12-233-8/+18
|\
| * Use method that creates runners registration tokenGrzegorz Bizon2015-12-232-2/+1
| * Add method that persist ensured token in `TokenAuthenticatable`Grzegorz Bizon2015-12-231-6/+13
| * Fix method that ensures authentication tokenGrzegorz Bizon2015-12-231-0/+4
* | Merge branch 'improve_emoji_picker' into 'master' Dmitriy Zaporozhets2015-12-231-12/+0
|\ \
| * | fix specsValery Sizov2015-12-221-6/+0
| * | base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-6/+0
| |/
* | Merge branch 'fix/ci-lint' into 'master' Grzegorz Bizon2015-12-232-28/+39
|\ \ | |/ |/|
| * Make CI Lint form synchronousfix/ci-lintGrzegorz Bizon2015-12-221-1/+1
| * Rename CI lint specs fileGrzegorz Bizon2015-12-221-0/+0
| * Improve CI Lint specs (refactoring)Grzegorz Bizon2015-12-221-18/+29
* | Merge branch 'fix_leave_project_display' into 'master' Stan Hu2015-12-222-0/+24
|\ \ | |/ |/|
| * Fix and test leave project displayDrew Blessing2015-12-212-0/+24
* | Move `ci_build_details_path` helper spec to correct locationRobert Speicher2015-12-212-22/+20
* | removes api credentials from link to build_pageMarvin Frick2015-12-221-0/+22
|/
* Merge branch 'add_email_unlock' into 'master' Robert Speicher2015-12-211-0/+1
|\
| * Allow account unlock via emailDrew Blessing2015-12-141-0/+1
* | Merge branch 'issue_3452'Douwe Maan2015-12-211-0/+64
|\ \
| * | Fix broken spec. #3452Rubén Dávila2015-12-161-1/+1
| * | Add link to MR from Build detail page. #3452Rubén Dávila2015-12-161-0/+64
* | | Merge branch 'coverage-regex' into 'master' Douwe Maan2015-12-211-0/+6
|\ \ \
| * | | Fix build coverage regex.Jared Szechy2015-12-201-0/+6
* | | | Backport JIRA serviceDrew Blessing2015-12-189-9/+391
* | | | Fix feature specs: we always show the build status if ci_commit is presentci-commit-status-skippedKamil Trzcinski2015-12-171-23/+6
* | | | Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the...Kamil Trzcinski2015-12-171-6/+11
|/ / /
* | | Merge branch 'api-support-starred-projects' into 'master' Dmitriy Zaporozhets2015-12-161-1/+20
|\ \ \
| * | | Api support for requesting starred projects for userZeger-Jan van de Weg2015-12-161-1/+20
* | | | Merge branch 'master' into fix-merge-immediately-buttonDouwe Maan2015-12-161-8/+3
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/rs-simplify-status-icon'Dmitriy Zaporozhets2015-12-161-8/+3
| |\ \ \
| | * | | Define CI status icon colors in SCSS instead of a helperrs-simplify-status-iconRobert Speicher2015-12-121-8/+3
* | | | | Fix updating and disabling merge button when Merge Immediately is clickedDouwe Maan2015-12-161-3/+3
|/ / / /
* | | | Merge branch 'fix-milestone-snippet-header' into 'master' Dmitriy Zaporozhets2015-12-164-6/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-164-6/+6
* | | | Merge branch 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitl...Dmitriy Zaporozhets2015-12-162-1/+21
|\ \ \ \ | |/ / / |/| | |
| * | | Add open_issues_count to project APIStan Hu2015-12-112-1/+21
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-161-3/+4
|\ \ \ \
| * \ \ \ Merge branch 'rs-timeago' into 'master' Douwe Maan2015-12-161-3/+4
| |\ \ \ \
| | * | | | Fix time_ago_with_tooltip for activity feedrs-timeagoRobert Speicher2015-12-111-3/+4
* | | | | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-1616-64/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed Rubocop offensesGabriel Mazetto2015-12-1516-64/+65
| | |_|_|/ | |/| | |
* | | | | Merge branch 'lazy-reference-extractor' into 'master' Robert Speicher2015-12-1523-40/+40
|\ \ \ \ \
| * | | | | Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-1523-40/+40
| |/ / / /
* | | | | Trigger notes refresh in specs instead of waiting for ajaxtests/note-pollingGrzegorz Bizon2015-12-151-1/+1
* | | | | Add minor fixes in note polling specsGrzegorz Bizon2015-12-151-4/+2
* | | | | Add feature specs for note pollingGrzegorz Bizon2015-12-151-0/+18
|/ / / /
* | | | Merge branch 'ux/suppress-ci-yml-warning' into 'master' Grzegorz Bizon2015-12-142-34/+81
|\ \ \ \
| * \ \ \ Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon2015-12-1459-1810/+682
| |\ \ \ \
| * | | | | Do not display ci build status if builds enabled but no `.gitlab-ci.yml`Grzegorz Bizon2015-12-141-1/+30
| * | | | | Improve gitlab ci commits specs (refactoring)Grzegorz Bizon2015-12-142-35/+39
| * | | | | Suppress warning about missing `.gitlab-ci.yml` if builds are disabledGrzegorz Bizon2015-12-141-7/+21
| | |_|_|/ | |/| | |