summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-187-144/+224
|\
| * Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-187-144/+224
* | Merge branch '19928-nomethoderror-undefined-method-id-for-nil-nilclass' into ...Rémy Coutable2016-07-181-0/+20
|\ \
| * | Don't blow up in tree view on empty repoSean McGivern2016-07-181-0/+20
* | | Merge branch '18593-avoid-parse_html-when-rinku-didnt-do-anything' into 'mast...Yorick Peterse2016-07-181-0/+20
|\ \ \
| * | | Don't parse Rinku returned value to DocFragment when it didn't change the ori...18593-avoid-parse_html-when-rinku-didnt-do-anythingPaco Guzman2016-07-181-0/+20
* | | | Merge branch 'store-variables-and-when-in-builds-table' into 'master' Rémy Coutable2016-07-183-83/+89
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables...store-variables-and-when-in-builds-tableKamil Trzcinski2016-07-1834-870/+1180
| |\ \ \
| * | | | Refactor gitlab_ci_yaml_processor variables testsKamil Trzcinski2016-07-171-52/+76
| * | | | Fix gitlab_ci_yaml_processor_spec.rbKamil Trzcinski2016-07-161-5/+5
| * | | | Fix gitlab_ci_yaml_processor_spec.rbKamil Trzcinski2016-07-161-1/+1
| * | | | Store when and yaml variables in builds tableKamil Trzcinski2016-07-163-31/+13
* | | | | Merge branch 'docker-registry-work-with-redirect' into 'master' Rémy Coutable2016-07-182-14/+87
|\ \ \ \ \
| * | | | | Explicitly remove authorization token and make sure that invalid addresses ar...Kamil Trzcinski2016-07-152-14/+87
* | | | | | Merge branch 'pending-tab' into 'master' Rémy Coutable2016-07-182-14/+68
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Modify test for Build tabsKatarzyna Kobierska2016-07-181-18/+26
| * | | | | Add tests to project builds for pending tabKatarzyna Kobierska2016-07-181-0/+12
| * | | | | Add test for new pending tab and update tests for running tabKatarzyna Kobierska2016-07-181-1/+35
| | |_|_|/ | |/| | |
* | | | | Merge branch 'api-isssues-due-date' into 'master' Rémy Coutable2016-07-181-0/+25
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | API: Expose due_date for issuesapi-isssues-due-dateRobert Schilling2016-07-121-0/+25
* | | | | Merge branch 'track-pipeline-user' into 'master' Rémy Coutable2016-07-183-1/+7
|\ \ \ \ \
| * | | | | Make rubocop happytrack-pipeline-userKamil Trzcinski2016-07-151-1/+1
| * | | | | Track a user who created a pipelineKamil Trzcinski2016-07-153-1/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix-deployment-creation-on-build-retry' into 'master' Rémy Coutable2016-07-181-0/+16
|\ \ \ \ \
| * | | | | Fix creation of deployment on build that is retried, redeployed or rollbackfix-deployment-creation-on-build-retryKamil Trzcinski2016-07-161-0/+16
* | | | | | Merge branch 'allow-to-pull-public-images' into 'master' Rémy Coutable2016-07-184-25/+136
|\ \ \ \ \ \
| * | | | | | Allow to access Container Registry for Public and Internal projectsallow-to-pull-public-imagesKamil Trzcinski2016-07-154-25/+136
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix-stage-status-show-for-pipelines' into 'master' Rémy Coutable2016-07-181-5/+19
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix stage status shown for pipelinesfix-stage-status-show-for-pipelinesKamil Trzcinski2016-07-151-5/+19
| |/ / / /
* | | | | Merge branch 'fix-lfs-ci-fetch' into 'master' Rémy Coutable2016-07-182-730/+768
|\ \ \ \ \
| * | | | | Fix LFS specsfix-lfs-ci-fetchKamil Trzcinski2016-07-151-1/+1
| * | | | | Fix fetching LFS objects for private CI projectsKamil Trzcinski2016-07-151-1/+6
| * | | | | Refactor LFS specs to use requests instead of LfsRouterKamil Trzcinski2016-07-152-730/+763
* | | | | | Merge branch 'allow-blank-import-url' into 'master' Rémy Coutable2016-07-182-3/+3
|\ \ \ \ \ \
| * | | | | | Fix spec to set import_url before attempting to create import_dataallow-blank-import-urlStan Hu2016-07-171-1/+1
| * | | | | | Allow a project import URL to be blank to prevent false positivesStan Hu2016-07-171-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'normalize_emoji_aliases_paths' into 'master' Rémy Coutable2016-07-181-0/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix not normalized emoji pathsdixpac2016-07-141-0/+32
* | | | | | Merge branch '19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wik...Stan Hu2016-07-161-3/+11
|\ \ \ \ \ \
| * | | | | | Fix a bug where the project's repository path was returned instead of the wik...19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wikiAlejandro Rodríguez2016-07-151-3/+11
* | | | | | | Merge branch 'syntax-highlight-unknown-language' into 'master' Robert Speicher2016-07-161-7/+27
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Don't fail to highlight when Rouge doesn't have a lexerDouwe Maan2016-07-151-7/+27
* | | | | | | Merge branch 'legacy-diff-notes-are-dumb' into 'master' Douwe Maan2016-07-151-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Update testslegacy-diff-notes-are-dumbDouwe Maan2016-07-151-4/+4
| |/ / / / / /
* | | | | | | Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6Douwe Maan2016-07-152-3/+4
|/ / / / / /
* | | | | | Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-155-34/+20
|\ \ \ \ \ \
| * | | | | | use %(...) and %[...] in favor of %<...>feature.rouge-20http://jneen.net/2016-07-141-1/+1
| * | | | | | expect final newlines from the banzai filterhttp://jneen.net/2016-07-141-1/+1
| * | | | | | stub out errors from the formatterhttp://jneen.net/2016-07-141-1/+1
| * | | | | | don't expect a random newline at the end of the thing?http://jneen.net/2016-07-141-1/+1