summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hotfix/ruby-21-broken-update' into 'master' Marin Jankovski2016-01-291-6/+6
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-...James Lopez2016-01-282-33/+33
| |\
| * | trick rubocop and temporarily add ruby 2.1 images for any branchJames Lopez2016-01-281-6/+6
* | | Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-281-1/+1
|\ \ \
| * \ \ Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-285-32/+40
| |\ \ \ | | |/ /
| * | | Fix specsDouwe Maan2016-01-281-1/+1
* | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-282-14/+24
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into highlight-blameDouwe Maan2016-01-285-32/+40
| |\ \ \ | | | |/ | | |/|
| * | | Move blame group logic to dedicated classDouwe Maan2016-01-282-14/+24
| | |/ | |/|
* | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-281-2/+2
|\ \ \
| * | | Fix broken specs. #2406Rubén Dávila2016-01-201-2/+2
* | | | Improve consistency and duplication for Merge Request APIimprove-mr-apiDmitriy Zaporozhets2016-01-281-31/+31
| |_|/ |/| |
* | | Merge branch 'update-ruby-2.2.4' into 'master' Douwe Maan2016-01-271-6/+6
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4James Lopez2016-01-2712-55/+449
| |\ \ \ | | | |/ | | |/|
| * | | fix rubocop new 2.2 syntax issuesJames Lopez2016-01-251-6/+6
* | | | Merge branch 'events-performance' into 'master' Robert Speicher2016-01-271-21/+0
|\ \ \ \
| * | | | Use Atom update times of the first eventevents-performanceYorick Peterse2016-01-271-21/+0
* | | | | Merge branch 'fix-ci-runners-version-update' into 'master' Robert Speicher2016-01-272-0/+29
|\ \ \ \ \
| * | | | | Fix CI runner version not being properly updated when asking for a buildfix-ci-runners-version-updateKamil Trzcinski2016-01-272-0/+29
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-2fa-requirement-wording' into 'master' Dmitriy Zaporozhets2016-01-271-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update wording for 2FA requirement noticers-2fa-requirement-wordingRobert Speicher2016-01-231-5/+5
| | |/ / | |/| |
* | | | Merge branch 'fix/commit-status-artifacts' into 'master' Kamil Trzciński2016-01-272-55/+80
|\ \ \ \
| * | | | Update commit status factory to reflect recent changesfix/commit-status-artifactsGrzegorz Bizon2016-01-261-2/+1
| * | | | Add specs for build created using generic commit statusGrzegorz Bizon2016-01-262-55/+81
| | |/ / | |/| |
* | | | Update ExternalIssue regex for JIRA integrationBlake Hitchcock2016-01-262-0/+26
* | | | Merge branch 'track-project-import-failure' into 'master' Douwe Maan2016-01-261-0/+106
|\ \ \ \
| * | | | Extract Projects::ImportService service from RepositoryImportWorkerDouglas Barbosa Alexandre2016-01-251-0/+106
* | | | | Merge branch 'rs-issue-12677' into 'master' Douwe Maan2016-01-261-0/+5
|\ \ \ \ \
| * | | | | Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-241-0/+5
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-261-0/+23
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-231-0/+23
| |/ / /
* | | | Merge branch 'fix-import-redirect-loop' into 'master' Robert Speicher2016-01-261-0/+109
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-251-0/+109
* | | | Merge branch 'instrumentation-signature' into 'master' Douglas Barbosa Alexandre2016-01-261-0/+10
|\ \ \ \
| * | | | Correct arity for instrumented methods w/o argsinstrumentation-signatureYorick Peterse2016-01-251-0/+10
| |/ / /
* | | | Merge branch 'rs-rails-security' into 'master' Robert Speicher2016-01-251-0/+6
|\ \ \ \
| * | | | Add temporary monkey patch to get specs passing on 4.2.5.1Robert Speicher2016-01-251-0/+6
| |/ / /
* | | | Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmesDouglas Barbosa Alexandre2016-01-251-0/+64
|/ / /
* | | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-01-251-0/+20
|\ \ \ | |/ / |/| |
| * | Use branch_count in Repository#has_visible_content?Yorick Peterse2016-01-211-0/+20
* | | Whitelist raw "abbr" elements when parsing MarkdownBenedict Etzel2016-01-231-0/+5
* | | Merge branch 'fix-comment-on-diff-ajax-loading'Dmitriy Zaporozhets2016-01-221-1/+1
|\ \ \
| * | | Fix failing specsfix-comment-on-diff-ajax-loadingRémy Coutable2016-01-211-1/+1
* | | | Merge branch 'ci/recursive-artifacts-entries' into 'master' Robert Speicher2016-01-213-11/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | Add method that calculates total size for artifacts subfolderci/recursive-artifacts-entriesKamil Trzcinski2016-01-203-11/+29
* | | | Merge branch 'ci/cache-key' into 'master' Douwe Maan2016-01-211-4/+21
|\ \ \ \
| * | | | Added cache:key to .gitlab-ci.yml allowing to fine tune the cachingci/cache-keyKamil Trzcinski2016-01-201-4/+21
| | |/ / | |/| |
* | | | Merge branch 'fix-github-pull-requests-import' into 'master' Robert Speicher2016-01-201-9/+18
|\ \ \ \
| * | | | Fix cross projects detection when importing GitHub pull requestsDouglas Barbosa Alexandre2016-01-201-9/+18
| |/ / /
* | | | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-201-0/+68
|\ \ \ \ | |/ / /