summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'inline-math-dollar' into 'master' Robert Speicher2016-12-221-8/+3
|\
| * Don't render inline math when dollar signs are inside markupinline-math-dollarDouwe Maan2016-12-221-8/+3
* | Merge branch 'cache-last-commit-sha-for-path' into 'master' Yorick Peterse2016-12-221-1/+1
|\ \
| * | Merge two methods.Hiroyuki Sato2016-12-201-1/+1
| * | Rename sha to idHiroyuki Sato2016-12-201-1/+1
| * | Use Repository#cache_last_commit_sha_for_path in APIHiroyuki Sato2016-12-201-1/+1
* | | Use `ref` variable24224-fix-project-ref-cacheDouwe Maan2016-12-221-1/+1
* | | Fix lookup of project by unknown ref when caching is enabledDouwe Maan2016-12-221-4/+15
| |/ |/|
* | Merge branch 'adam-auto-deploy' into 'master' Kamil Trzciński2016-12-211-2/+8
|\ \
| * | Introduce "Set up autodeploy" button to help configure GitLab CI for deploymentadam-auto-deployAdam Niedzielski2016-12-211-2/+8
* | | Filter protocol-relative URLs in ExternalLinkFilter. Fixes issue #22742.Makoto Scott-Hinkle2016-12-211-1/+1
* | | Merge branch '25908-fix-grape-after-update' into 'master' Yorick Peterse2016-12-211-2/+2
|\ \ \
| * | | Use Grape's new Route methods25908-fix-grape-after-updateRémy Coutable2016-12-211-2/+2
* | | | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-215-9/+115
|\ \ \ \
| * | | | Improve API specsKamil Trzcinski2016-12-211-14/+18
| * | | | Fix a few error messagesKamil Trzcinski2016-12-202-4/+4
| * | | | Use separate file for error.rbKamil Trzcinski2016-12-201-2/+0
| * | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-202-3/+3
| |\ \ \ \
| | * | | | Fix rspec tests due to different APIZ.J. van de Weg2016-12-201-2/+2
| | * | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Z.J. van de Weg2016-12-202-8/+35
| | |\ \ \ \
| | * | | | | Fix rubocop errors [ci skip]Z.J. van de Weg2016-12-201-1/+1
| * | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2015-156/+271
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Add missing Mattermost::ErrorKamil Trzcinski2016-12-201-0/+3
| * | | | | | Add with_lease to session [ci skip]Kamil Trzcinski2016-12-201-8/+32
| | |/ / / / | |/| | | |
| * | | | | WIPKamil Trzcinski2016-12-202-14/+14
| * | | | | Work on tests for mattermostKamil Trzcinski2016-12-202-3/+17
| * | | | | Fix Mattermost clientKamil Trzcinski2016-12-201-1/+1
| * | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2020-43/+159
| |\ \ \ \ \
| * | | | | | Fix flowKamil Trzcinski2016-12-203-21/+46
| * | | | | | Improve sourcesKamil Trzcinski2016-12-193-7/+23
| * | | | | | Last fixesZ.J. van de Weg2016-12-191-4/+0
| * | | | | | Merge branch 'master' into zj-mattermost-slash-configZ.J. van de Weg2016-12-1911-14/+124
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into zj-matt...Z.J. van de Weg2016-12-191-3/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-193-20/+14
| * | | | | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-193-24/+17
| |/ / / / / / /
| * | | | | | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1844-325/+1120
| |\ \ \ \ \ \ \
| * | | | | | | | Incorporate reviewZ.J. van de Weg2016-12-161-12/+0
| * | | | | | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-162-7/+15
| * | | | | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-configZ.J. van de Weg2016-12-162-17/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Ensure the session is destroyedZ.J. van de Weg2016-12-151-3/+5
| | * | | | | | | | Improve session testsZ.J. van de Weg2016-12-151-3/+6
| | * | | | | | | | Setup mattermost sessionZ.J. van de Weg2016-12-121-0/+102
| * | | | | | | | | Add auto configure of commandsZ.J. van de Weg2016-12-163-14/+23
| * | | | | | | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-163-2/+47
| * | | | | | | | | Improve session testsZ.J. van de Weg2016-12-161-3/+5
| * | | | | | | | | Setup mattermost sessionZ.J. van de Weg2016-12-161-0/+102
* | | | | | | | | | Merge branch 'fix/group-path-rename-error' into 'master' Douwe Maan2016-12-211-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix error 500 renaming group. Also added specs and changelog.James Lopez2016-12-201-0/+3
* | | | | | | | | | | Merge branch 'multipart-uploaded-file' into 'master' Rémy Coutable2016-12-211-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Inject ::UploadedFile from Multipart middlewareJacob Vosmaer2016-12-211-2/+6