summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-drop-ruby-21-tests' into 'master' Rémy Coutable2017-02-1320-47/+35
|\
| * Update Rubocop to ruby 2.3zj-drop-ruby-21-testsZ.J. van de Weg2017-02-0720-47/+35
* | Merge branch 'docs/merge_requests_index' into 'master' Achilleas Pipinellis2017-02-134-180/+178
|\ \
| * | Move merge requests index file inside the merge_requests dirAchilleas Pipinellis2017-02-134-180/+178
* | | Merge branch 'fix_issue_from_milestone' into 'master'Rémy Coutable2017-02-135-3/+25
|\ \ \
| * | | fix issue creation from milestone doesn't assign the milestonewendy04022017-02-125-3/+25
* | | | Merge branch 'concurrent-foreign-keys' into 'master'Rémy Coutable2017-02-138-10/+183
|\ \ \ \ | |_|/ / |/| | |
| * | | Enforce use of add_concurrent_foreign_keyconcurrent-foreign-keysYorick Peterse2017-02-106-3/+64
| * | | Add method for creating foreign keys concurrentlyYorick Peterse2017-02-102-7/+119
* | | | Merge branch 'rename_files_delete_service' into 'master' Rémy Coutable2017-02-135-7/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Rename Files::DeleteService to Files::DestroyServicedixpac2017-02-105-7/+11
* | | | Merge branch '28029-improve-blockquote-formatting-on-emails' into 'master'Annabel Dunstone Gray2017-02-112-0/+11
|\ \ \ \
| * | | | Add CHANGELOG file28029-improve-blockquote-formatting-on-emailsAlfredo Sumaran2017-02-101-0/+4
| * | | | Stylize blockquote in notification emailsAlfredo Sumaran2017-02-101-0/+7
* | | | | Merge branch 'clean-javascript-vendor-files' into 'master' Filipa Lacerda2017-02-1115-9095/+9
|\ \ \ \ \
| * | | | | convert js-cookie dependency to an npm moduleclean-javascript-vendor-filesMike Greiling2017-02-115-4/+5
| * | | | | convert timeago.js dependency to an npm moduleMike Greiling2017-02-115-240/+4
| * | | | | remove vue from vendor since it is now in node_modulesMike Greiling2017-02-116-8851/+0
| |/ / / /
* | | | | Merge branch '27994-fix-mr-widget-jump' into 'master' Filipa Lacerda2017-02-103-6/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into 27994-fix-mr-widget-jumpFilipa Lacerda2017-02-1057-189/+402
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | adds changelog27994-fix-mr-widget-jumpNur Rony2017-02-101-0/+4
| * | | | fixes MR widget jumpNur Rony2017-02-102-6/+6
* | | | | Merge branch 'static-navbar' into 'master' Jacob Schatz2017-02-1022-70/+62
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add js prefix to right sidebarAnnabel Dunstone Gray2017-02-105-5/+8
| * | | | Replace accidentally deleted metaclickAnnabel Dunstone Gray2017-02-101-0/+8
| * | | | Remove right padding from navbar-collapse on large screensAnnabel Dunstone Gray2017-02-101-0/+4
| * | | | Add changelogAnnabel Dunstone Gray2017-02-101-0/+4
| * | | | common_utils merge conflictsAnnabel Dunstone Gray2017-02-101-3/+1
| * | | | Set sidebar height to 100% if at top of pageAnnabel Dunstone Gray2017-02-101-0/+2
| * | | | Set height of fixed sidebars with jsAnnabel Dunstone Gray2017-02-102-1/+11
| * | | | Add sticky sidebar on wiki pageAnnabel Dunstone Gray2017-02-102-2/+2
| * | | | Fix comment button test for slash commandsAnnabel Dunstone Gray2017-02-101-1/+1
| * | | | Fix time tracking specAnnabel Dunstone Gray2017-02-101-1/+1
| * | | | Fix issue boards sidebar alignment and sidebar toggle specAnnabel Dunstone Gray2017-02-102-6/+2
| * | | | Fix failing conflicts testAnnabel Dunstone Gray2017-02-101-1/+1
| * | | | Fix build sidebar scrollingAnnabel Dunstone Gray2017-02-101-16/+0
| * | | | Refactor JSAnnabel Dunstone Gray2017-02-101-3/+1
| * | | | Fix pinned sidebar alignmentAnnabel Dunstone Gray2017-02-101-1/+1
| * | | | Remove navbar height offsetsAnnabel Dunstone Gray2017-02-104-30/+5
| * | | | Keep sidebars absolute until fixed at top; remove unneeded JSAnnabel Dunstone Gray2017-02-108-17/+21
| * | | | Fix sidebar scrollingAnnabel Dunstone Gray2017-02-102-2/+12
| * | | | Remove fixed positioning from navbarAnnabel Dunstone Gray2017-02-104-7/+3
|/ / / /
* | | | Merge branch '27987-skipped-pipeline-mr-graph' into 'master' Alfredo Sumaran2017-02-102-2/+7
|\ \ \ \
| * | | | Add changelog27987-skipped-pipeline-mr-graphAnnabel Dunstone Gray2017-02-101-0/+4
| * | | | Only show MR widget graph if there are stagesAnnabel Dunstone Gray2017-02-101-2/+3
* | | | | Merge branch 'replace-teaspoon-references' into 'master' Clement Ho2017-02-104-22/+15
|\ \ \ \ \
| * | | | | Replace teaspoon references with Karmareplace-teaspoon-referencesClement Ho2017-02-104-22/+15
* | | | | | Merge branch '27783-fix-fe-doc-broken-link' into 'master' Filipa Lacerda2017-02-102-42/+48
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 27783-fix-fe-doc-broken-link27783-fix-fe-doc-broken-linkFilipa Lacerda2017-02-1013-20/+57
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | moved hyperlink reference section at the end of the contentNur Rony2017-02-101-41/+43