summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|_|/ | |/| | |
* | | | | Use a new admin runners path when reseting runners tokenGrzegorz Bizon2015-12-141-1/+1
* | | | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-142-0/+0
|\ \ \ \ \
| * | | | | Move CI admin builds and runners specs to correct directory [ci skip]Kamil Trzcinski2015-12-142-0/+0
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-1464-1820/+836
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-1442-1125/+490
| |\ \ \ \
| | * | | | Fix specsKamil Trzcinski2015-12-113-4/+5
| | * | | | Fix after column renameKamil Trzcinski2015-12-115-16/+16
| | * | | | Fix errorsKamil Trzcinski2015-12-113-4/+3
| | * | | | Fix triggers testsKamil Trzcinski2015-12-112-19/+13
| | * | | | Reimplement Trigger APIKamil Trzcinski2015-12-111-0/+80
| | * | | | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-1111-200/+199
| | * | | | Add runners tokenKamil Trzcinski2015-12-111-1/+1
| | * | | | Migrate CI::Project to ProjectKamil Trzcinski2015-12-1138-961/+253
| * | | | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-1419-682/+189
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Fix specsKamil Trzcinski2015-12-102-3/+3
| | * | | Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-1019-682/+189
| * | | | Fix testsDmitriy Zaporozhets2015-12-111-1/+1
| * | | | Fix tests for new issuable sidebarDmitriy Zaporozhets2015-12-111-7/+20
| | |/ / | |/| |
| * | | Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037Douwe Maan2015-12-111-1/+1
| * | | Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan2015-12-113-6/+128
| |\ \ \
| | * | | Refactor CI YAML processor's validatorsGrzegorz Bizon2015-12-081-3/+3
| | * | | Move `common_mentionable_setup` to shared context in specsGrzegorz Bizon2015-12-081-3/+3
| | * | | Add `RepositoryPush` specsGrzegorz Bizon2015-12-081-0/+122
| * | | | emoji aliases problemValery Sizov2015-12-111-0/+9
* | | | | Stub also `ensure_*` method in CI runners API specsci/persist-registration-tokenGrzegorz Bizon2015-12-111-0/+1