summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix focus element issue36166_confi_polish_oneRegis2017-08-091-5/+1
* resolve discussion pointsRegis2017-08-092-18/+10
* Merge branch 'master' into 36166_confi_polish_oneRegis2017-08-081-0/+29
|\
| * Merge branch 'winh-restore-blob-fixture' into 'master'Filipa Lacerda2017-08-081-0/+29
| |\
| | * Restore blob fixture for JavaScript testswinh-restore-blob-fixturewinh2017-08-081-0/+29
| |/
* | Merge branch 'master' into 36166_confi_polish_oneRegis2017-08-0842-97/+189
|\ \ | |/
| * Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspecRobert Speicher2017-08-081-4/+4
| * Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0834-48/+90
| |\
| | * Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0834-48/+90
| * | Merge branch 'fly-out-nav-collapsed' into 'master'Annabel Dunstone Gray2017-08-083-9/+78
| |\ \
| | * | Fix fly-out navigation not showing for active items in collapsed sidebarPhil Hughes2017-08-083-9/+78
| |/ /
| * | Merge branch '36168-fix-transient-preferences-specs' into 'master'Sean McGivern2017-08-081-12/+16
| |\ \
| | * | Fix Profile > Preferences feature specs36168-fix-transient-preferences-specsRémy Coutable2017-08-081-12/+16
| | |/
| * | Merge branch 'remove-repo-editor-feature-flag' into 'master'Jacob Schatz2017-08-084-27/+4
| |\ \
| | * | Revert "Add user_dropdown_link to prompt users to turn on new repo"remove-repo-editor-feature-flagMike Greiling2017-08-083-3/+0
| | * | hide the feature flag for the repo editor featureMike Greiling2017-08-081-22/+0
| | * | Revert "Combine 'turn on/off' user dropdown links into 'experimental features...Mike Greiling2017-08-085-5/+7
* | | | remove need for 'is-not-confidential' - cascade changeRegis2017-08-083-13/+6
* | | | fix confidential border issue via scss and hamlRegis2017-08-082-1/+5
|/ / /
* | | Merge branch '36169-fix-master' into 'master'Sean McGivern2017-08-081-13/+8
|\ \ \
| * | | Fix a broken Events API spec36169-fix-masterRémy Coutable2017-08-081-13/+8
* | | | Merge branch 'gitaly-bundle-gemfile' into 'master'Rémy Coutable2017-08-082-2/+2
|\ \ \ \
| * | | | Unset BUNDLE_GEMFILE when installing GitalyJacob Vosmaer2017-08-082-2/+2
* | | | | Merge branch '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-...Rémy Coutable2017-08-085-8/+29
|\ \ \ \ \
| * | | | | Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-oneblackst0ne2017-08-085-8/+29
* | | | | | Merge branch '35052-please-select-a-file-when-attempting-to-upload-or-replace...Filipa Lacerda2017-08-087-4/+84
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | disable file upload button while uploading35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-uiSimon Knox2017-08-087-4/+84
* | | | | | 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
|/ / / / / / / /
View Lorry Controller Status