Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | switch to email_reply_trimmer from discourse | http://jneen.net/ | 2016-12-21 | 1 | -26/+4 | |
* | | | | | | | | | | | | Merge branch '25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourc... | Douwe Maan | 2016-12-27 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix MR with files hidden by .gitattributes25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file | Sean McGivern | 2016-12-26 | 1 | -1/+4 | |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'auto-deploy-with-space' into 'master' | Sean McGivern | 2016-12-27 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Rename "autodeploy" to "auto deploy"auto-deploy-with-space | Adam Niedzielski | 2016-12-23 | 1 | -2/+2 | |
* | | | | | | | | | | | | Merge branch 'feature/more-storage-statistics' into 'master' | Sean McGivern | 2016-12-26 | 6 | -79/+98 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add more storage statistics | Markus Koller | 2016-12-21 | 5 | -43/+82 | |
| * | | | | | | | | | | | Remove rake task update_commit_count | Markus Koller | 2016-12-21 | 1 | -20/+0 | |
| * | | | | | | | | | | | Consistently use current_user in API entities | Markus Koller | 2016-12-21 | 3 | -21/+21 | |
| * | | | | | | | | | | | Don't expose all namespace fields in API | Markus Koller | 2016-12-21 | 1 | -2/+2 | |
* | | | | | | | | | | | | Merge branch 'zj-fix-issue-search-chat-command' into 'master' | Rémy Coutable | 2016-12-23 | 2 | -8/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix errorcode 500 on slash commandszj-fix-issue-search-chat-command | Z.J. van de Weg | 2016-12-23 | 2 | -8/+9 | |
* | | | | | | | | | | | | Merge branch 'fixes-issues-api-reopen' into 'master' | Rémy Coutable | 2016-12-23 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix state_event parameter to reopen an issuefixes-issues-api-reopen | Robert Schilling | 2016-12-22 | 1 | -2/+1 | |
* | | | | | | | | | | | | Merge branch 'inline-math-dollar' into 'master' | Robert Speicher | 2016-12-22 | 1 | -8/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Don't render inline math when dollar signs are inside markupinline-math-dollar | Douwe Maan | 2016-12-22 | 1 | -8/+3 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'cache-last-commit-sha-for-path' into 'master' | Yorick Peterse | 2016-12-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Merge two methods. | Hiroyuki Sato | 2016-12-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Rename sha to id | Hiroyuki Sato | 2016-12-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Use Repository#cache_last_commit_sha_for_path in API | Hiroyuki Sato | 2016-12-20 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Use `ref` variable24224-fix-project-ref-cache | Douwe Maan | 2016-12-22 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Fix lookup of project by unknown ref when caching is enabled | Douwe Maan | 2016-12-22 | 1 | -4/+15 | |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'adam-auto-deploy' into 'master' | Kamil Trzciński | 2016-12-21 | 1 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Introduce "Set up autodeploy" button to help configure GitLab CI for deploymentadam-auto-deploy | Adam Niedzielski | 2016-12-21 | 1 | -2/+8 | |
* | | | | | | | | | | | | | Filter protocol-relative URLs in ExternalLinkFilter. Fixes issue #22742. | Makoto Scott-Hinkle | 2016-12-21 | 1 | -1/+1 | |
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch '25908-fix-grape-after-update' into 'master' | Yorick Peterse | 2016-12-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Use Grape's new Route methods25908-fix-grape-after-update | Rémy Coutable | 2016-12-21 | 1 | -2/+2 | |
* | | | | | | | | | | | | Merge branch 'zj-mattermost-slash-config' into 'master' | Kamil Trzciński | 2016-12-21 | 5 | -9/+115 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Improve API specs | Kamil Trzcinski | 2016-12-21 | 1 | -14/+18 | |
| * | | | | | | | | | | | | Fix a few error messages | Kamil Trzcinski | 2016-12-20 | 2 | -4/+4 | |
| * | | | | | | | | | | | | Use separate file for error.rb | Kamil Trzcinski | 2016-12-20 | 1 | -2/+0 | |
| * | | | | | | | | | | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ... | Kamil Trzcinski | 2016-12-20 | 2 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Fix rspec tests due to different API | Z.J. van de Weg | 2016-12-20 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ... | Z.J. van de Weg | 2016-12-20 | 2 | -8/+35 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Fix rubocop errors [ci skip] | Z.J. van de Weg | 2016-12-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 15 | -156/+271 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add missing Mattermost::Error | Kamil Trzcinski | 2016-12-20 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | Add with_lease to session [ci skip] | Kamil Trzcinski | 2016-12-20 | 1 | -8/+32 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | WIP | Kamil Trzcinski | 2016-12-20 | 2 | -14/+14 | |
| * | | | | | | | | | | | | | Work on tests for mattermost | Kamil Trzcinski | 2016-12-20 | 2 | -3/+17 | |
| * | | | | | | | | | | | | | Fix Mattermost client | Kamil Trzcinski | 2016-12-20 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config | Kamil Trzcinski | 2016-12-20 | 20 | -43/+159 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix flow | Kamil Trzcinski | 2016-12-20 | 3 | -21/+46 | |
| * | | | | | | | | | | | | | | Improve sources | Kamil Trzcinski | 2016-12-19 | 3 | -7/+23 | |
| * | | | | | | | | | | | | | | Last fixes | Z.J. van de Weg | 2016-12-19 | 1 | -4/+0 | |
| * | | | | | | | | | | | | | | Merge branch 'master' into zj-mattermost-slash-config | Z.J. van de Weg | 2016-12-19 | 11 | -14/+124 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt... | Z.J. van de Weg | 2016-12-19 | 1 | -3/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 3 | -20/+14 | |
| * | | | | | | | | | | | | | | | | Minor adjustments API Mattermost | Z.J. van de Weg | 2016-12-19 | 3 | -24/+17 | |
| |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'master' into 'zj-mattermost-slash-config' | Zeger-Jan van de Weg | 2016-12-18 | 44 | -325/+1120 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |