Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'patch-19' into 'master' | Rémy Coutable | 2017-05-02 | 1 | -2/+2 |
|\ | | | | | | | | | Gitlab -> GitLab See merge request !10952 | ||||
| * | Gitlab -> GitLab | Ben Bodenmiller | 2017-04-27 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'pdf-test-fix' into 'master' | Sean McGivern | 2017-05-02 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Fixed PDF blob specs See merge request !11025 | ||||
| * | | Fixed PDF blob specs | Phil Hughes | 2017-05-02 | 1 | -1/+1 |
| | | | | | | | | | | | | The PDF file is no longer included in the repo, so we need to create the PDF before running the tests | ||||
* | | | Merge branch '19364-webhook-edit' into 'master' | Dmitriy Zaporozhets | 2017-05-02 | 18 | -170/+372 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Implement ability to update hooks Closes #19364 See merge request !10816 | ||||
| * | | | Implement ability to update hooks | Alexander Randa | 2017-04-28 | 18 | -170/+372 |
| | | | | |||||
* | | | | Merge branch '26488-target-disabled-mr' into 'master' | Sean McGivern | 2017-05-02 | 12 | -4/+111 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 404 when upstream disabled merge requests Closes #26488 See merge request !10427 | ||||
| * | | | | Fix 404 when upstream has disabled merge requests | mhasbini | 2017-04-27 | 12 | -4/+111 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'wabernat1/gitlab-ce-patch-14' into 'master' 31515-navigation-menu-bugs-on-the-contribution-analytics-page | Sean Packham (GitLab) | 2017-05-02 | 2 | -16/+20 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update docs on creating a project See merge request !10957 | ||||
| * | | | | Update docs on creating a project | Achilleas Pipinellis | 2017-05-02 | 2 | -16/+20 |
| | | | | | |||||
* | | | | | Merge branch 'menway/gitlab-ce-patch-15' into 'master' | Sean Packham (GitLab) | 2017-05-02 | 4 | -0/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Change to correct directory in update instructions See merge request !10958 | ||||
| * | | | | Change to correct directory in update instructionsmenway/gitlab-ce-patch-15 | menway | 2017-04-27 | 4 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge branch 'add-tanuki-ci-status-favicons' into 'master' | Sean McGivern | 2017-05-02 | 23 | -1/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated to new favicons Closes #12818 See merge request !10923 | ||||
| * | | | | | [ci skip] Added changelog entry | Luke "Jared" Bennett | 2017-05-02 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Renamed notfound favicon nameadd-tanuki-ci-status-favicons | Luke "Jared" Bennett | 2017-05-01 | 3 | -0/+0 |
| | | | | | | |||||
| * | | | | | added not-found status favicons | Dimitrie Hoekstra | 2017-05-01 | 2 | -0/+0 |
| | | | | | | |||||
| * | | | | | Added test | Luke "Jared" Bennett | 2017-04-25 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | updated to new favicons | Luke "Jared" Bennett | 2017-04-25 | 19 | -1/+4 |
| | | | | | | |||||
* | | | | | | Merge branch '30535-display-whether-pages-is-enabled-in-the-admin-dashboard' ↵ | Rémy Coutable | 2017-05-02 | 2 | -0/+10 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Display GitLab Pages status in Admin Dashboard Closes #30535 See merge request !11007 | ||||
| * | | | | | Display GitLab Pages status in Admin Dashboard | Mark Fletcher | 2017-05-01 | 2 | -0/+10 |
| | | | | | | |||||
* | | | | | | Merge branch '20830-getting-started-better-explore-groups-view' into 'master' | Phil Hughes | 2017-05-02 | 12 | -48/+335 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better Explore Groups view Closes #20830 See merge request !7230 | ||||
| * | | | | | | Better Explore Groups view | Luke "Jared" Bennett | 2017-05-02 | 12 | -48/+335 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'pdflab-in-repo' into 'master' | Phil Hughes | 2017-05-02 | 17 | -15/+327 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move PDFLab assets into repo See merge request !10642 | ||||
| * | | | | | | Move PDFLab into GitLabpdflab-in-repo | Sam Rose | 2017-04-28 | 17 | -15/+327 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'zj-upgrade-carrierwave' into 'master' | Douwe Maan | 2017-05-01 | 7 | -26/+29 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Carrierwave and fog-core See merge request !11016 | ||||
| * | | | | | | | Update Carrierwave and fog-core | Zeger-Jan van de Weg | 2017-05-01 | 7 | -26/+29 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'fix/add-specs-for-request-profiler' into 'master' | Douwe Maan | 2017-05-01 | 3 | -0/+140 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for Gitlab::RequestProfiler Closes #31513 See merge request !11005 | ||||
| * | | | | | | | Add specs for Gitlab::RequestProfiler | Ahmad Sherif | 2017-05-01 | 3 | -0/+140 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Closes #31513 | ||||
* | | | | | | | Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' | Douwe Maan | 2017-05-01 | 3 | -1/+16 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't blow up when email has no References header Closes gitlab-ee#2247 See merge request !11014 | ||||
| * | | | | | | | Don't blow up when email has no References headerdont-blow-up-when-email-has-no-references-header | Sean McGivern | 2017-05-01 | 3 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an email doesn't match our incoming email patterns on the To header, we fall back to the References header. If there was no References header, we'd raise an exception, when we'd be better off acting as if it was empty. | ||||
* | | | | | | | | Merge branch 'dm-blob-download-button' into 'master' | Sean McGivern | 2017-05-01 | 6 | -6/+44 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Raw button as Download for binary files See merge request !10743 | ||||
| * | | | | | | | | Add changelogdm-blob-download-button | Douwe Maan | 2017-04-30 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Show Raw button as Download for binary files | Douwe Maan | 2017-04-30 | 5 | -6/+40 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '31463-group-all-linters' into 'master' | Robert Speicher | 2017-05-01 | 3 | -46/+61 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Consider grouping all static analysis jobs into a single one" Closes #31463 See merge request !10946 | ||||
| * | | | | | | | | | Add scripts/static-analysis to run all the static analysers in one go31463-group-all-linters | Rémy Coutable | 2017-05-01 | 2 | -9/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | | Shorten and improve some job names | Rémy Coutable | 2017-05-01 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | | Group static-analysis jobs into a single job | Rémy Coutable | 2017-05-01 | 2 | -32/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | | | | Merge branch ↵ | Douwe Maan | 2017-05-01 | 3 | -5/+7 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28968-revert-allow-people-with-merge-access-to-create-branches' into 'master' Prevent people from creating branches if they don't have persmission to push Closes #28968 See merge request !10983 | ||||
| * | | | | | | | | | Prevent people from creating branches if they don't have persmission to push | Pawel Chojnacki | 2017-04-28 | 3 | -5/+7 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'dm-snippet-blob-viewers' into 'master' | Sean McGivern | 2017-05-01 | 31 | -76/+482 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use blob viewers for snippets See merge request !10747 | ||||
| * | | | | | | | | | | Add changelogdm-snippet-blob-viewers | Douwe Maan | 2017-04-30 | 1 | -0/+4 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Use blob viewers for snippets | Douwe Maan | 2017-04-30 | 30 | -76/+478 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '30586-fix-gitaly-is-ancestor' into 'master' 31611-sketch43-click-opens-new-tab-and-closes-it-quickly | Sean McGivern | 2017-05-01 | 5 | -36/+41 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Gitaly::Commit#is_ancestor Closes #30586 See merge request !10634 | ||||
| * | | | | | | | | | | Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestor | Kim "BKC" Carlbäcker | 2017-04-28 | 5 | -36/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Upgrade Gitaly-version | ||||
* | | | | | | | | | | | Merge branch '31615-fix-dropdown-animation-failure' into 'master' | Jacob Schatz | 2017-05-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed transient failure related to dropdown animations Closes #31615 See merge request !11002 | ||||
| * | | | | | | | | | | Fixed transient failure related to dropdown animations31615-fix-dropdown-animation-failure | Luke "Jared" Bennett | 2017-04-30 | 1 | -0/+1 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Update CHANGELOG.md for 9.1.2 | Timothy Andrew | 2017-05-01 | 9 | -32/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | | | | | Merge branch 'rs-add_column_with_default_cops' into 'master' | Sean McGivern | 2017-05-01 | 16 | -13/+121 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cop to blacklist specific tables for `add_column_with_default` Closes #31293 See merge request !10892 | ||||
| * | | | | | | | | | | Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrationsrs-add_column_with_default_cops | Robert Speicher | 2017-04-28 | 11 | -0/+11 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add AddColumnWithDefaultToLargeTable cop | Robert Speicher | 2017-04-28 | 3 | -0/+96 |
| | | | | | | | | | | |