summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0834-48/+90
* Merge branch 'fly-out-min-width' into 'master'Annabel Dunstone Gray2017-08-081-1/+1
|\
| * Fix fly-out width when it has long itemsfly-out-min-widthPhil Hughes2017-08-081-1/+1
* | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-0820-158/+180
|\ \
| * | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-079-26/+76
| * | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-077-53/+46
| * | Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-0715-85/+64
* | | Merge branch 'header-z-index-fix' into 'master'Annabel Dunstone Gray2017-08-082-1/+3
|\ \ \
| * | | Fixed modals being below navbarheader-z-index-fixPhil Hughes2017-08-072-1/+3
* | | | Merge branch '35098-raise-encoding-confidence-threshold' into 'master'Sean McGivern2017-08-085-1/+102
|\ \ \ \
| * | | | Make sure that we have author and committerLin Jen-Shin2017-08-081-0/+3
| * | | | Add a test to show that threshold 40 would corrupt35098-raise-encoding-confidence-thresholdLin Jen-Shin2017-08-083-0/+94
| * | | | Add changelog entryLin Jen-Shin2017-08-081-0/+4
| * | | | Raise encoding confidence threshold to 50Lin Jen-Shin2017-08-081-1/+1
* | | | | Merge branch 'rc/fix-commits-api' into 'master'Sean McGivern2017-08-0810-173/+592
|\ \ \ \ \
| * | | | | Fix the /projects/:id/repository/commits endpoint to handle dots in the ref n...rc/fix-commits-apiRémy Coutable2017-08-0810-173/+592
| |/ / / /
* | | | | Merge branch 'project-homepage-activity' into 'master'Tim Zallmann2017-08-082-0/+16
|\ \ \ \ \
| * | | | | Fixed activity not loading on project homepageproject-homepage-activityPhil Hughes2017-08-082-0/+16
| | |_|_|/ | |/| | |
* | | | | Merge branch '35136-barchart-not-display-label-at-0-hour' into 'master'Clement Ho2017-08-083-21/+23
|\ \ \ \ \
| * | | | | Fix bar chart does not display label at hour 0Jason Dai2017-08-083-21/+23
|/ / / / /
* | | | | Merge branch 'winh-scope-haml-linter' into 'master'Grzegorz Bizon2017-08-081-9/+11
|\ \ \ \ \
| * | | | | Restrict InlineJavaScript for haml_lint to dev and test environmentwinh-scope-haml-linterwinh2017-08-081-9/+11
* | | | | | Merge branch 'project_events_noteable_iid' into 'master'Rémy Coutable2017-08-085-3/+90
|\ \ \ \ \ \
| * | | | | | Expose noteable_iid in Notesue4452017-08-085-3/+90
|/ / / / / /
* | | | | | Merge branch 'rc/fix-tags-api' into 'master'Sean McGivern2017-08-089-184/+388
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name...Rémy Coutable2017-08-089-184/+388
| | |/ / / | |/| | |
* | | | | Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into 'mas...Rémy Coutable2017-08-083-18/+27
|\ \ \ \ \
| * | | | | Print the setup steps and duration and fix an issue resulting in re-setuping ...35941-fix-testing-issue-following-gitaly-install-fixRémy Coutable2017-08-043-9/+18
| * | | | | Unset the RUBYOPT env variable before installing gitaly-rubyRémy Coutable2017-08-043-6/+11
| * | | | | Revert "Merge branch 'fix-gitaly-install' into 'master'"Rémy Coutable2017-08-043-17/+12
* | | | | | Merge branch '35002_add_italian_translations_of_pipeline_schedules' into 'mas...Rémy Coutable2017-08-081-3/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add Italian translations of Pipeline SchedulesHuang Tao2017-08-081-3/+27
|/ / / / /
* | | | | Merge branch 'document-and-test-api-iids' into 'master'Rémy Coutable2017-08-084-8/+8
|\ \ \ \ \
| * | | | | Fix the iids parameters in the API documentationFrank Pavageau2017-08-074-8/+8
* | | | | | Merge branch 'ide' into 'master'Mike Greiling2017-08-08101-239/+3706
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into ideMike Greiling2017-08-07204-4690/+3960
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge branch '24685_view_self' into 'master'Jacob Schatz2017-08-086-22/+35
|\ \ \ \ \ \ \
| * | | | | | | Show all labelsRegis Boudinot2017-08-086-22/+35
|/ / / / / / /
* | | | | | | Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-0829-55/+196
|\ \ \ \ \ \ \
| * | | | | | | Exclude merge_jid on Import/Export attribute configurationOswaldo Ferreira2017-08-071-0/+1
| * | | | | | | Re-add column locked_at on migration rollback31207-clean-locked-merge-requestsOswaldo Ferreira2017-08-071-1/+1
| * | | | | | | Move locked_at removal to post-deployment migrationOswaldo Ferreira2017-08-073-2/+3
| * | | | | | | Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-0728-54/+193
* | | | | | | | Merge branch '33874_confi' into 'master'Jacob Schatz2017-08-0714-28/+434
|\ \ \ \ \ \ \ \
| * | | | | | | | 33874 confidential issue redesignRegis Boudinot2017-08-0714-28/+434
|/ / / / / / / /
* | | | | | | | Merge branch '35729-user-dropdown-in-filtered-search-does-not-load-avatar-on-...Clement Ho2017-08-074-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "User dropdown in filtered search does not load avatar on `master`"Tim Zallmann2017-08-074-3/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-073-20/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-076-24/+67
| |/ / / / / / /
* | | | | | | | Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-075-5/+25
|\ \ \ \ \ \ \ \
View Lorry Controller Status