Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix/import-export-symlink-vulnerability' into 'security' | Douwe Maan | 2016-11-03 | 7 | -4/+105 |
* | Merge branch 'fix/import-projectmember-security' into 'security' | Douwe Maan | 2016-11-03 | 4 | -14/+34 |
* | Add changelog instructions to CHANGELOG.md | Robert Speicher | 2016-11-03 | 1 | -1/+4 |
* | Update help banner for bin/changelog | Robert Speicher | 2016-11-03 | 1 | -1/+1 |
* | Merge branch 'rs-changelog-force' into 'master' | Rémy Coutable | 2016-11-03 | 3 | -2/+38 |
|\ | |||||
| * | Add a `--force` option to bin/changelogrs-changelog-force | Robert Speicher | 2016-11-02 | 3 | -2/+38 |
* | | Merge branch 'eslint-check-file-names' into 'master' | Fatih Acet | 2016-11-02 | 3 | -0/+8 |
|\ \ | |/ |/| | |||||
| * | Check that JavaScript file names match convention (!7238) | winniehell | 2016-11-02 | 3 | -0/+8 |
* | | Merge branch 'sortable-version-update' into 'master' | Fatih Acet | 2016-11-02 | 3 | -55/+149 |
|\ \ | |||||
| * | | Updated Sortable JS pluginsortable-version-update | Phil Hughes | 2016-11-01 | 3 | -55/+149 |
* | | | Merge branch 'post_receive-spaces' into 'master' | Rémy Coutable | 2016-11-02 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | remove extra spaces from app/workers/post_receive.rb | Elan Ruusamäe | 2016-11-01 | 1 | -3/+3 |
* | | | | Merge branch 'rs-changelog-docs' into 'master' vue-ize-field-errors | Robert Speicher | 2016-11-02 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Update examples in changelog docs to use single quotes around title | Robert Speicher | 2016-11-02 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Merge branch 'boards-filter-zindex' into 'master' | Annabel Dunstone Gray | 2016-11-02 | 1 | -5/+0 |
|\ \ \ \ | |||||
| * | | | | Removed z-index for filters on issue boardsboards-filter-zindex | Phil Hughes | 2016-11-02 | 1 | -5/+0 |
* | | | | | Merge branch 'edit-button-wiki' into 'master' | Annabel Dunstone Gray | 2016-11-02 | 4 | -7/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Add a CHANGELOG entry | Hiroyuki Sato | 2016-11-01 | 1 | -0/+1 |
| * | | | | | Fix edit button wiki | Hiroyuki Sato | 2016-11-01 | 3 | -7/+7 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'rs-bin-changelog' into 'master' | Rémy Coutable | 2016-11-02 | 5 | -7/+396 |
|\ \ \ \ \ | |||||
| * | | | | | Add specs for ChangelogOptionParser in bin/changelogrs-bin-changelog | Robert Speicher | 2016-10-31 | 2 | -1/+67 |
| * | | | | | Add changelog documentation | Robert Speicher | 2016-10-31 | 3 | -7/+167 |
| * | | | | | Add a bin/changelog script | Robert Speicher | 2016-10-31 | 1 | -0/+163 |
* | | | | | | Merge branch 'eslint-ignore-coverage-files' into 'master' | Rémy Coutable | 2016-11-02 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make ESLint ignore instrumented files for coverage analysis (!7236) | winniehell | 2016-11-02 | 1 | -0/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'update-diffy' into 'master' | Rémy Coutable | 2016-11-02 | 2 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update diffy gem to 3.1.0 | Manuel Rüger | 2016-10-31 | 2 | -3/+3 |
* | | | | | | | Merge branch 'bkintz/gitlab-ce-17846-jira-comment-path' | Rémy Coutable | 2016-11-02 | 3 | -1/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use the server's base URL without relative URL part when creating links in JIRA | Brian Kintz | 2016-11-02 | 3 | -1/+24 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'fix/contributing-mr-template' into 'master' | Rémy Coutable | 2016-11-02 | 1 | -3/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Replace MR Description Format links | Daniel Axelrod | 2016-11-02 | 1 | -3/+5 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'patch-8' into 'master' | Rémy Coutable | 2016-11-02 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update gitlab.yml.example | Elan Ruusamäe | 2016-11-02 | 1 | -1/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'update-rack-attack' into 'master' | Rémy Coutable | 2016-11-02 | 2 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update rack-attack gem to 4.4.1 | Manuel Rüger | 2016-10-31 | 2 | -3/+3 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mrchrisw/gitlab-version-fix' into 'master' | Achilleas Pipinellis | 2016-11-02 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | GitLab 8.13 not 13mrchrisw/gitlab-version-fix | Chris Wilson | 2016-11-02 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'fix/backtrace-command' into 'master' | Sean McGivern | 2016-11-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix gdb backtrace command | Daniel Axelrod | 2016-11-01 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'patch-6' into 'master' | Achilleas Pipinellis | 2016-11-02 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add container registry images to not exported list | Ben Bodenmiller | 2016-10-29 | 1 | -0/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'gpocentek/gitlab-ce-api-webhook-token' into 'master' | Rémy Coutable | 2016-11-02 | 4 | -2/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Ensure hook tokens are write-only in the APIgpocentek/gitlab-ce-api-webhook-token | Sean McGivern | 2016-11-01 | 3 | -7/+35 |
| * | | | | | | | | Add support for token attr in project hooks API | Gauvain Pocentek | 2016-11-01 | 5 | -3/+12 |
* | | | | | | | | | Merge branch 'slony-upgrade-guide' into 'master' | Achilleas Pipinellis | 2016-11-02 | 3 | -0/+485 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Added guide for upgrading Postgres using Slonyslony-upgrade-guide | Yorick Peterse | 2016-11-01 | 3 | -0/+485 |
* | | | | | | | | | | Merge branch '23713-milestone-dropdown-not-selected' into 'master' | Robert Speicher | 2016-11-02 | 3 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fixes milestone dropdown not select issue23713-milestone-dropdown-not-selected | Nur Rony | 2016-11-01 | 3 | -3/+9 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'create_hooks_rake' into 'master' | Rémy Coutable | 2016-11-02 | 9 | -191/+327 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add Rake task to create/repair GitLab Shell hooks symlinks | Drew Blessing | 2016-11-01 | 9 | -191/+327 |