summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [Rails5] Fix lib/tasks/tokens.rb and replace some ActiveRecord::Base recordsjprovazn-apprecord-testblackst0ne2018-11-1213-13/+14
* [Rails5] Replace ActiveRecord::Base with ApplicationRecordblackst0ne2018-11-12350-493/+493
* Minor gem fixesJan Provaznik2018-11-123-3/+3
* Add ApplicationRecord model classJan Provaznik2018-11-121-0/+5
* Addressed documentation commentsJan Provaznik2018-11-121-9/+21
* Address specs failing in rails 4Jan Provaznik2018-11-123-2/+16
* Fix trigerring of rails 4 tests in CIJan Provaznik2018-11-121-1/+1
* Add missing changelogJan Provaznik2018-11-121-0/+5
* Make rails5 defailt in bin/* scriptsJan Provaznik2018-11-123-3/+3
* Add rails5 docJan Provaznik2018-11-122-0/+16
* Update db/schema.rb according to Rails 5Jan Provaznik2018-11-121-537/+403
* Fix index for mysql adapterJan Provaznik2018-11-121-16/+34
* Switch rails 4 to 5 in gitlab-ciJan Provaznik2018-11-123-93/+93
* Switch to Rails 5 by defaultJan Provaznik2018-11-128-146/+153
* Consistently use Vue.nexTick when starting taskListPhil Hughes2018-11-121-8/+11
* Fixed failing note actions specPhil Hughes2018-11-121-0/+3
* Init task list when creating new note & discussionPhil Hughes2018-11-122-0/+2
* Fix TaskList init on update & pollPhil Hughes2018-11-123-11/+10
* Improve initial rendering of discussion notesPhil Hughes2018-11-125-13/+21
* Merge branch 'rails5-update-gemfile' into 'master'Sean McGivern2018-11-121-1/+1
|\
| * Upgrade whitequark/parser to 2.5.3.0Jan Provaznik2018-11-121-1/+1
* | Merge branch 'docs-dev-guidelines-update' into 'master'Achilleas Pipinellis2018-11-123-319/+459
|\ \
| * | Docs: updates docs development guidelinesMarcia Ramos2018-11-123-319/+459
|/ /
* | Merge branch 'docs/danger-documentation' into 'master'Rémy Coutable2018-11-121-3/+26
|\ \
| * | Proper markdown table in docs DangerfileAchilleas Pipinellis2018-11-121-14/+16
| * | Edits to docs Dangerfiledocs/danger-documentationMike Lewis2018-11-091-10/+21
| * | Dangerbot: mention tech writers based on DevOps stageAchilleas Pipinellis2018-11-091-3/+13
* | | Merge branch 'sh-bump-sidekiq' into 'master'Sean McGivern2018-11-122-5/+5
|\ \ \ | |_|/ |/| |
| * | Update gems in Gemfile.rails5.lockJan Provaznik2018-11-121-2/+2
| * | Bump Sidekiq and other related gemsStan Hu2018-11-091-3/+3
* | | Merge branch 'jprovazn-fix-status-spec' into 'master'qa-xss-in-mentions-testRémy Coutable2018-11-121-3/+3
|\ \ \
| * | | Fix transient rspec issueJan Provaznik2018-11-121-3/+3
* | | | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-1215-242/+374
|\ \ \ \
| * | | | Fix minor offensesblackst0ne-add-discord-serviceblackst0ne2018-11-102-6/+2
| * | | | Refactor specsblackst0ne2018-11-074-469/+253
| * | | | DRY specs, fix typos in docsblackst0ne2018-11-065-45/+35
| * | | | Update documentation after documentation review.blackst0ne2018-11-051-2/+2
| * | | | Updated docs and removed redundant screenshotblackst0ne2018-11-052-2/+2
| * | | | Update docs after docs reviewblackst0ne2018-11-051-14/+13
| * | | | Update Gemfileblackst0ne2018-11-053-17/+7
| * | | | Fix frozen stringsblackst0ne2018-11-051-0/+2
| * | | | Update documentationblackst0ne2018-11-053-0/+31
| * | | | Add spec for DiscordServiceblackst0ne2018-11-051-0/+242
| * | | | Update discord notification serviceblackst0ne2018-11-051-6/+4
| * | | | Add changelog entryblackst0ne2018-11-051-0/+5
| * | | | Add Discord integrationblackst0ne2018-10-309-0/+95
* | | | | Merge branch 'disable-usage-ping-review-apps' into 'master'Rémy Coutable2018-11-121-0/+1
|\ \ \ \ \
| * | | | | Disable usage pings in review appsdisable-usage-ping-review-appsBalasankar "Balu" C2018-11-111-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-githu...Sean McGivern2018-11-123-5/+5
|\ \ \ \ \
| * | | | | Update gitlab-markup gem to avoid binary name collision53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markupAlejandro Rodríguez2018-11-113-5/+5
| |/ / / /