Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix/cross-reference-notes-forks' into 'master' | Douwe Maan | 2016-02-16 | 3 | -5/+30 |
|\ | |||||
| * | updated system note service and spec based on feedback | James Lopez | 2016-02-16 | 2 | -5/+3 |
| * | fix rubocop warning | James Lopez | 2016-02-12 | 1 | -2/+4 |
| * | woo hoo - getting there with the cross-reference issue. Should fix the proble... | James Lopez | 2016-02-12 | 2 | -8/+17 |
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer... | James Lopez | 2016-02-12 | 52 | -213/+622 |
| |\ | |||||
| * \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer... | James Lopez | 2016-02-10 | 155 | -759/+1952 |
| |\ \ | |||||
| * | | | update changelog | James Lopez | 2016-02-08 | 1 | -0/+1 |
| * | | | fixed spec - at last! | James Lopez | 2016-02-05 | 1 | -3/+2 |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/cross-refer... | James Lopez | 2016-02-05 | 47 | -245/+733 |
| |\ \ \ | |||||
| * | | | | WIP - fix and spec for cross reference issue with forks | James Lopez | 2016-02-04 | 2 | -2/+18 |
* | | | | | Merge branch 'rs-issue-13467' into 'master' | Douwe Maan | 2016-02-16 | 2 | -2/+39 |
|\ \ \ \ \ | |||||
| * | | | | | Ensure Commit#show responds 404 instead of 500 when given an invalid IDrs-issue-13467 | Robert Speicher | 2016-02-15 | 2 | -2/+39 |
* | | | | | | Merge branch 'rs-git_not_found' into 'master' | Douwe Maan | 2016-02-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Provide explicit html format when rendering git_not_found pagers-git_not_found | Robert Speicher | 2016-02-15 | 1 | -1/+1 |
| * | | | | | | Properly render the `errors/git_not_found` page | Robert Speicher | 2016-02-15 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Updates to git flow documentation. | Sytse Sijbrandij | 2016-02-15 | 1 | -5/+6 |
* | | | | | | Merge branch 'rs-gitlab-database-module' into 'master' | Robert Speicher | 2016-02-15 | 2 | -6/+34 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix undefined method `postgresql?` during migrationrs-gitlab-database-module | Robert Speicher | 2016-02-15 | 2 | -6/+34 |
|/ / / / / | |||||
* | | | | | Merge branch 'offline-migration-docs' into 'master' | Douwe Maan | 2016-02-15 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Add notice about offline migrationsoffline-migration-docs | Kamil Trzciński | 2015-11-02 | 1 | -1/+5 |
* | | | | | | Merge branch 'fix-me-me-me-me' into 'master' | Valery Sizov | 2016-02-15 | 4 | -2/+39 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add spinach tests for award emojifix-me-me-me-me | Stan Hu | 2016-02-13 | 2 | -1/+36 |
| * | | | | | | Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji | Stan Hu | 2016-02-13 | 2 | -1/+3 |
* | | | | | | | Merge branch 'update-omniauth-1-3-1' into 'master' | Robert Speicher | 2016-02-13 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update omniauth to 1.3.1 for memory performance | Takuya Noguchi | 2016-02-13 | 2 | -4/+4 |
* | | | | | | | | Merge branch 'fix/ci-emails-broken-link' into 'master' | Douwe Maan | 2016-02-13 | 8 | -279/+302 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move profile notifications specs to separate filefix/ci-emails-broken-link | Grzegorz Bizon | 2016-02-12 | 2 | -98/+107 |
| * | | | | | | | | Move build emails specs to separate file | Grzegorz Bizon | 2016-02-12 | 3 | -177/+186 |
| * | | | | | | | | Add Changelog entry for links fixes in build emails | Grzegorz Bizon | 2016-02-12 | 1 | -0/+1 |
| * | | | | | | | | Fix broken link in CI build notification emails | Grzegorz Bizon | 2016-02-12 | 4 | -46/+50 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ben.boeckel/gitlab-ce-fixup-links-in-generic-docs' into 'master' | Douwe Maan | 2016-02-13 | 8 | -32/+46 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docs | Ben Boeckel | 2016-02-12 | 8 | -32/+46 |
* | | | | | | | | Merge branch 'backup_ci_rm' into 'master' | Achilleas Pipinellis | 2016-02-12 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Remove note on backing up GitLab CI as a separate service | Achilleas Pipinellis | 2016-02-13 | 1 | -2/+0 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fix-duplicate-hook-notifications' into 'master' | Douwe Maan | 2016-02-12 | 3 | -10/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix duplicated branch creation/deletion Web hooks/service notifications when ... | Stan Hu | 2016-02-09 | 3 | -10/+3 |
* | | | | | | | | Merge branch 'fix_500-commit-null' into 'master' | Douwe Maan | 2016-02-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Don't try to mark broken MR as mergable | Nemanja Boric | 2016-02-11 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'rs-issue-merge-requests' into 'master' | Douwe Maan | 2016-02-12 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Correct indentation for `issues/merge_requests` partial renderrs-issue-merge-requests | Robert Speicher | 2016-02-11 | 1 | -3/+3 |
* | | | | | | | | | Merge branch 'rs-loosen-nokogiri' into 'master' | Dmitriy Zaporozhets | 2016-02-12 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Loosen Nokogiri version requirementrs-loosen-nokogiri | Robert Speicher | 2016-02-11 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'workhorse-0.6.4' into 'master' | Rémy Coutable | 2016-02-12 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use gitlab-workhorse 0.6.4workhorse-0.6.4 | Jacob Vosmaer | 2016-02-12 | 3 | -3/+3 |
* | | | | | | | | | | Merge branch 're-add-update-configuration-files-in-latest-upgrade-guide' into... | Rémy Coutable | 2016-02-12 | 1 | -2/+12 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Re-add "Update configuration files" section in the 8.4 to 8.5 upgrade guide | Rémy Coutable | 2016-02-12 | 1 | -2/+12 |
* | | | | | | | | | | | Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master' | Douwe Maan | 2016-02-12 | 4 | -12/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-order | Oliver Rogers | 2016-02-10 | 4 | -12/+10 |
* | | | | | | | | | | | Merge branch 'typo_api_builds_doc' into 'master' | Achilleas Pipinellis | 2016-02-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix typo in doc/api/builds.md | Achilleas Pipinellis | 2016-02-12 | 1 | -1/+1 |
|/ / / / / / / / / / / |