summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* resolves conflicts with new buttonsJacob Schatz2015-12-2320-57/+576
|\
| * Merge branch 'add-project-permissions' into 'master' Dmitriy Zaporozhets2015-12-231-0/+13
| |\
| | * Add project permissions to all project API endpointsStan Hu2015-12-221-0/+13
| * | 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
* | | | | fixes tests to work with jasmine/jqueryJacob Schatz2015-12-232-13/+16
* | | | | adds alerts for when http request errors out in some way.Jacob Schatz2015-12-211-10/+1
* | | | | clarifies tests with methods like `toBeVisible()` etc.Jacob Schatz2015-12-211-12/+9
* | | | | updates tests style for four-phase-testing as per: https://robots.thoughtbot....Jacob Schatz2015-12-211-1/+17
* | | | | open and close issue via ajax request. With testsJacob Schatz2015-12-212-1/+40
|/ / / /
* | | | 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
| |/ / / /
View Lorry Controller Status